tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix UseDelay crash (#8324)

Browse Source
This commit is contained in:
metalgearsloth
2022-05-21 15:50:38 +10:00
committed by GitHub
parent d0a7d8af51
commit b5615b2564
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Shared/Timing/UseDelaySystem.cs
View File

@@ -75,10 +75,10 @@ public sealed class UseDelaySystem : EntitySystem
foreach (var delay in _activeDelays) foreach (var delay in _activeDelays)
{ {
if (curTime > delay.DelayEndTime if (delay.DelayEndTime == null ||
|| !mQuery.TryGetComponent(delay.Owner, out var meta) curTime > delay.DelayEndTime ||
|| meta.Deleted Deleted(delay.Owner, mQuery) ||
|| delay.CancellationTokenSource?.Token.IsCancellationRequested == true) delay.CancellationTokenSource?.Token.IsCancellationRequested == true)
{ {
toRemove.Add(delay); toRemove.Add(delay);
} }
@@ -89,6 +89,7 @@ public sealed class UseDelaySystem : EntitySystem
delay.CancellationTokenSource = null; delay.CancellationTokenSource = null;
delay.DelayEndTime = null; delay.DelayEndTime = null;
_activeDelays.Remove(delay); _activeDelays.Remove(delay);
Dirty(delay);
} }
} }