From d57dc161c4ef85c351391d1e34adae50c6b32df2 Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Tue, 11 Oct 2022 12:34:46 +1300 Subject: [PATCH] Fix melee error (#11825) --- Content.Client/Weapons/Melee/MeleeWeaponSystem.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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); } ///