From bde62ca0f28a63fa0df6a9d8c8ab54fd6cdde9a1 Mon Sep 17 00:00:00 2001
From: eoineoineoin <helloworld@eoinrul.es>
Date: Fri, 31 Oct 2025 00:11:20 +0000
Subject: [PATCH] Fix client crash in MeleeWeaponSystem (#41121)

Avoid crash when animating deleted entity
---
 Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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<TrackUserComponent, TransformComponent>();
         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);