From b5615b2564cdf1174d526d80b2cebecc21cd2da4 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Sat, 21 May 2022 15:50:38 +1000
Subject: [PATCH] Fix UseDelay crash (#8324)

---
 Content.Shared/Timing/UseDelaySystem.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Content.Shared/Timing/UseDelaySystem.cs b/Content.Shared/Timing/UseDelaySystem.cs
index b98ea84e00..e27dcfbcd6 100644
--- a/Content.Shared/Timing/UseDelaySystem.cs
+++ b/Content.Shared/Timing/UseDelaySystem.cs
@@ -75,10 +75,10 @@ public sealed class UseDelaySystem : EntitySystem
 
         foreach (var delay in _activeDelays)
         {
-            if (curTime > delay.DelayEndTime
-                || !mQuery.TryGetComponent(delay.Owner, out var meta)
-                || meta.Deleted
-                || delay.CancellationTokenSource?.Token.IsCancellationRequested == true)
+            if (delay.DelayEndTime == null ||
+                curTime > delay.DelayEndTime ||
+                Deleted(delay.Owner, mQuery) ||
+                delay.CancellationTokenSource?.Token.IsCancellationRequested == true)
             {
                 toRemove.Add(delay);
             }
@@ -89,6 +89,7 @@ public sealed class UseDelaySystem : EntitySystem
             delay.CancellationTokenSource = null;
             delay.DelayEndTime = null;
             _activeDelays.Remove(delay);
+            Dirty(delay);
         }
     }