DeadDropSystem: check teardown

new-frontiers-14 · Oct 15, 2024 · 61384b3 · 61384b3
1 parent 1ff123b
commit 61384b3
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/Content.Server/_NF/Smuggling/DeadDropSystem.cs b/Content.Server/_NF/Smuggling/DeadDropSystem.cs
@@ -227,6 +227,12 @@ public void CompromiseDeadDrop(EntityUid uid, DeadDropComponent _)
         if (potentialDeadDrops.Count > 0)
         {
             var item = _random.Pick(potentialDeadDrops);
+
+            // If the item is tearing down, do nothing for now.
+            // FIXME: separate sector-wide scheduler?
+            if (MetaData(item.ent).EntityLifeStage >= EntityLifeStage.Terminating)
+                return;
+
             AddDeadDrop(item.ent);
             _sawmill.Debug($"Dead drop at {uid} compromised, new drop at {item.ent}!");
         }