Fix TimedDespawnComponent causing a crash if spawning another entity …

…with TimedDespawnComponent (#5345)
space-wizards · Aug 10, 2024 · 99e4910 · 99e4910
1 parent b503390
commit 99e4910
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/Robust.Shared/Spawners/SharedTimedDespawnSystem.cs b/Robust.Shared/Spawners/SharedTimedDespawnSystem.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Audio;
+using System.Collections.Generic;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Timing;
@@ -9,6 +9,8 @@ public abstract class SharedTimedDespawnSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
 
+    private readonly HashSet<EntityUid> _queuedDespawnEntities = new();
+
     public override void Initialize()
     {
         base.Initialize();
@@ -24,6 +26,8 @@ public override void Update(float frameTime)
         if (!_timing.IsFirstTimePredicted)
             return;
 
+        _queuedDespawnEntities.Clear();
+
         var query = EntityQueryEnumerator<TimedDespawnComponent>();
 
         while (query.MoveNext(out var uid, out var comp))
@@ -35,11 +39,16 @@ public override void Update(float frameTime)
 
             if (comp.Lifetime <= 0)
             {
-                var ev = new TimedDespawnEvent();
-                RaiseLocalEvent(uid, ref ev);
-                QueueDel(uid);
+                _queuedDespawnEntities.Add(uid);
             }
         }
+
+        foreach (var queued in _queuedDespawnEntities)
+        {
+            var ev = new TimedDespawnEvent();
+            RaiseLocalEvent(queued, ref ev);
+            QueueDel(queued);
+        }
     }
 
     protected abstract bool CanDelete(EntityUid uid);