Fix instant awaited DoAfters (#15088)

2023-04-03 16:53:24 +12:00
parent 3dbd581382
commit 6e1fa57155
1 changed files with 6 additions and 0 deletions
--- a/Content.Shared/DoAfter/SharedDoAfterSystem.cs
+++ b/Content.Shared/DoAfter/SharedDoAfterSystem.cs
@@ -139,6 +139,12 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
        if (!TryStartDoAfter(doAfter, out var id, component))
            return DoAfterStatus.Cancelled;

+        if (doAfter.Delay <= TimeSpan.Zero)
+        {
+            Logger.Warning("Awaited instant DoAfters are not supported fully supported");
+            return DoAfterStatus.Finished;
+        }
+
        var tcs = new TaskCompletionSource<DoAfterStatus>();
        component.AwaitedDoAfters.Add(id.Value.Index, tcs);
        return await tcs.Task;