Stop terminating entities from being removed from containers (#22232)

2023-12-09 20:00:53 -05:00
parent 8bc4d2ab7a
commit 5da332f75e
2 changed files with 8 additions and 1 deletions
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs
@@ -177,6 +177,9 @@ public abstract partial class SharedHandsSystem

        var entity = hand.Container.ContainedEntity.Value;

+        if (TerminatingOrDeleted(uid) || TerminatingOrDeleted(entity))
+            return;
+
        if (!hand.Container.Remove(entity, EntityManager))
        {
            Log.Error($"Failed to remove {ToPrettyString(entity)} from users hand container when dropping. User: {ToPrettyString(uid)}. Hand: {hand.Name}.");