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

30
Content.Server/Teleportation/HandTeleporterSystem.cs
View File

@@ -1,6 +1,6 @@
using System.Threading;
using Content.Server.Administration.Logs;
using Content.Server.DoAfter;
using Content.Shared.DoAfter;
using Content.Shared.Database;
using Content.Shared.Interaction.Events;
using Content.Shared.Teleportation.Components;
@@ -24,19 +24,17 @@ public sealed class HandTeleporterSystem : EntitySystem
{
SubscribeLocalEvent<HandTeleporterComponent, UseInHandEvent>(OnUseInHand);
SubscribeLocalEvent<HandTeleporterComponent, HandTeleporterSuccessEvent>(OnPortalSuccess);
SubscribeLocalEvent<HandTeleporterComponent, HandTeleporterCancelledEvent>(OnPortalCancelled);
SubscribeLocalEvent<HandTeleporterComponent, DoAfterEvent>(OnDoAfter);
}
private void OnPortalSuccess(EntityUid uid, HandTeleporterComponent component, HandTeleporterSuccessEvent args)
private void OnDoAfter(EntityUid uid, HandTeleporterComponent component, DoAfterEvent args)
{
component.CancelToken = null;
HandlePortalUpdating(uid, component, args.User);
}
if (args.Cancelled || args.Handled)
return;
private void OnPortalCancelled(EntityUid uid, HandTeleporterComponent component, HandTeleporterCancelledEvent args)
{
component.CancelToken = null;
HandlePortalUpdating(uid, component, args.Args.User);
args.Handled = true;
}
private void OnUseInHand(EntityUid uid, HandTeleporterComponent component, UseInHandEvent args)
@@ -47,12 +45,6 @@ public sealed class HandTeleporterSystem : EntitySystem
if (Deleted(component.SecondPortal))
component.SecondPortal = null;
if (component.CancelToken != null)
{
component.CancelToken.Cancel();
return;
}
if (component.FirstPortal != null && component.SecondPortal != null)
{
// handle removing portals immediately as opposed to a doafter
@@ -64,16 +56,12 @@ public sealed class HandTeleporterSystem : EntitySystem
if (xform.ParentUid != xform.GridUid)
return;
component.CancelToken = new CancellationTokenSource();
var doafterArgs = new DoAfterEventArgs(args.User, component.PortalCreationDelay,
component.CancelToken.Token, used: uid)
var doafterArgs = new DoAfterEventArgs(args.User, component.PortalCreationDelay, used: uid)
{
BreakOnDamage = true,
BreakOnStun = true,
BreakOnUserMove = true,
MovementThreshold = 0.5f,
UsedCancelledEvent = new HandTeleporterCancelledEvent(),
UsedFinishedEvent = new HandTeleporterSuccessEvent(args.User)
};
_doafter.DoAfter(doafterArgs);