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

DoAfter Refactor (#13225)

Browse Source 
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
This commit is contained in:
keronshb
2023-02-24 19:01:25 -05:00
committed by GitHub
parent 7a9baa79c2
commit 9ebb452a3c
129 changed files with 2624 additions and 4132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
View File

@@ -1,5 +1,4 @@
using System.Linq;
using System.Threading;
using System.Linq;
using Content.Server.DoAfter;
using Content.Server.Explosion.EntitySystems;
using Content.Server.Mind.Components;
@@ -9,6 +8,7 @@ using Content.Server.Storage.Components;
using Content.Server.Tools.Systems;
using Content.Shared.Access.Components;
using Content.Shared.Coordinates;
using Content.Shared.DoAfter;
using Content.Shared.Lock;
using Content.Shared.Storage.Components;
using Robust.Shared.Random;
@@ -33,7 +33,7 @@ public sealed class BluespaceLockerSystem : EntitySystem
SubscribeLocalEvent<BluespaceLockerComponent, ComponentStartup>(OnStartup);
SubscribeLocalEvent<BluespaceLockerComponent, StorageBeforeOpenEvent>(PreOpen);
SubscribeLocalEvent<BluespaceLockerComponent, StorageAfterCloseEvent>(PostClose);
SubscribeLocalEvent<BluespaceLockerComponent, BluespaceLockerTeleportDelayComplete>(OnBluespaceLockerTeleportDelayComplete);
SubscribeLocalEvent<BluespaceLockerComponent, DoAfterEvent>(OnDoAfter);
}
private void OnStartup(EntityUid uid, BluespaceLockerComponent component, ComponentStartup args)
@@ -67,13 +67,6 @@ public sealed class BluespaceLockerSystem : EntitySystem
if (!Resolve(uid, ref entityStorageComponent))
return;
if (component.CancelToken != null)
{
component.CancelToken.Cancel();
component.CancelToken = null;
return;
}
if (!component.BehaviorProperties.ActOnOpen)
return;
@@ -265,9 +258,14 @@ public sealed class BluespaceLockerSystem : EntitySystem
PostClose(uid, component);
}
private void OnBluespaceLockerTeleportDelayComplete(EntityUid uid, BluespaceLockerComponent component, BluespaceLockerTeleportDelayComplete args)
private void OnDoAfter(EntityUid uid, BluespaceLockerComponent component, DoAfterEvent args)
{
if (args.Handled || args.Cancelled)
return;
PostClose(uid, component, false);
args.Handled = true;
}
private void PostClose(EntityUid uid, BluespaceLockerComponent component, bool doDelay = true)
@@ -278,8 +276,6 @@ public sealed class BluespaceLockerSystem : EntitySystem
if (!Resolve(uid, ref entityStorageComponent))
return;
component.CancelToken?.Cancel();
if (!component.BehaviorProperties.ActOnClose)
return;
@@ -287,13 +283,8 @@ public sealed class BluespaceLockerSystem : EntitySystem
if (doDelay && component.BehaviorProperties.Delay > 0)
{
EnsureComp<DoAfterComponent>(uid);
component.CancelToken = new CancellationTokenSource();
_doAfterSystem.DoAfter(
new DoAfterEventArgs(uid, component.BehaviorProperties.Delay, component.CancelToken.Token)
{
UserFinishedEvent = new BluespaceLockerTeleportDelayComplete()
});
_doAfterSystem.DoAfter(new DoAfterEventArgs(uid, component.BehaviorProperties.Delay));
return;
}
@@ -400,8 +391,4 @@ public sealed class BluespaceLockerSystem : EntitySystem
break;
}
}
private sealed class BluespaceLockerTeleportDelayComplete : EntityEventArgs
{
}
}