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

Another round of DoAfter fixes (#14295)

Browse Source
This commit is contained in:
keronshb
2023-02-28 19:51:42 -05:00
committed by GitHub
parent 20f54d2ace
commit e9dbcc4278
10 changed files with 60 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/Resist/ResistLockerSystem.cs
View File

@@ -1,3 +1,4 @@
using System.Threading;
using Content.Server.DoAfter;
using Content.Server.Popups;
using Content.Server.Storage.Components;
@@ -44,7 +45,9 @@ public sealed class ResistLockerSystem : EntitySystem
if (!Resolve(target, ref storageComponent, ref resistLockerComponent))
return;
var doAfterEventArgs = new DoAfterEventArgs(user, resistLockerComponent.ResistTime, target:target)
resistLockerComponent.CancelToken = new CancellationTokenSource();
var doAfterEventArgs = new DoAfterEventArgs(user, resistLockerComponent.ResistTime, cancelToken:resistLockerComponent.CancelToken.Token, target:target)
{
BreakOnTargetMove = false,
BreakOnUserMove = true,
@@ -55,13 +58,13 @@ public sealed class ResistLockerSystem : EntitySystem
resistLockerComponent.IsResisting = true;
_popupSystem.PopupEntity(Loc.GetString("resist-locker-component-start-resisting"), user, user, PopupType.Large);
resistLockerComponent.DoAfter = _doAfterSystem.DoAfter(doAfterEventArgs);
_doAfterSystem.DoAfter(doAfterEventArgs);
}
private void OnRemoved(EntityUid uid, ResistLockerComponent component, EntRemovedFromContainerMessage args)
{
if (component.DoAfter != null)
_doAfterSystem.Cancel(uid, component.DoAfter);
component.CancelToken?.Cancel();
component.CancelToken = null;
}
private void OnDoAfter(EntityUid uid, ResistLockerComponent component, DoAfterEvent args)
@@ -69,6 +72,7 @@ public sealed class ResistLockerSystem : EntitySystem
if (args.Cancelled)
{
component.IsResisting = false;
component.CancelToken = null;
_popupSystem.PopupEntity(Loc.GetString("resist-locker-component-resist-interrupted"), args.Args.User, args.Args.User, PopupType.Medium);
return;
}
@@ -89,6 +93,7 @@ public sealed class ResistLockerSystem : EntitySystem
_entityStorage.TryOpenStorage(args.Args.User, uid);
}
component.CancelToken = null;
args.Handled = true;
}
}