diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs index 49b5b4a25b..3fbd4dce69 100644 --- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs +++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs @@ -216,7 +216,7 @@ public sealed partial class MeleeWeaponSystem var query = EntityQueryEnumerator(); while (query.MoveNext(out var uid, out var arcComponent, out var xform)) { - if (arcComponent.User == null) + if (arcComponent.User == null || EntityManager.Deleted(arcComponent.User)) continue; Vector2 targetPos = TransformSystem.GetWorldPosition(arcComponent.User.Value);