]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix client crash in MeleeWeaponSystem (#41121)
authoreoineoineoin <helloworld@eoinrul.es>
Fri, 31 Oct 2025 00:11:20 +0000 (00:11 +0000)
committerGitHub <noreply@github.com>
Fri, 31 Oct 2025 00:11:20 +0000 (00:11 +0000)
Avoid crash when animating deleted entity

Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs

index 49b5b4a25b00968f75032f997189560b734dd0bf..3fbd4dce6956ddefc726d588783173a56512572a 100644 (file)
@@ -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);