diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs index 0169867d10..0edab3b9c1 100644 --- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs +++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs @@ -227,7 +227,9 @@ public sealed partial class MeleeWeaponSystem : SharedMeleeWeaponSystem private void OnMeleeLunge(MeleeLungeEvent ev) { - DoLunge(ev.Entity, ev.Angle, ev.LocalPos, ev.Animation); + // Entity might not have been sent by PVS. + if (Exists(ev.Entity)) + DoLunge(ev.Entity, ev.Angle, ev.LocalPos, ev.Animation); } ///