Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

DoAfter and other bugfixes (#14669)

Browse Source
This commit is contained in:
Leon Friedrich
2023-03-15 15:05:53 +13:00
committed by GitHub
parent 5df1d6194f
commit 2f88173730
6 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,7 @@ public sealed class ResistLockerSystem : EntitySystem
{
base.Initialize();
SubscribeLocalEvent<ResistLockerComponent, ContainerRelayMovementEntityEvent>(OnRelayMovement);
SubscribeLocalEvent<ResistLockerComponent, DoAfterEvent>(OnDoAfter);
SubscribeLocalEvent<ResistLockerComponent, DoAfterEvent<LockerDoAfterData>>(OnDoAfter);
SubscribeLocalEvent<ResistLockerComponent, EntRemovedFromContainerMessage>(OnRemoved);
}
@@ -58,7 +58,7 @@ public sealed class ResistLockerSystem : EntitySystem
resistLockerComponent.IsResisting = true;
_popupSystem.PopupEntity(Loc.GetString("resist-locker-component-start-resisting"), user, user, PopupType.Large);
_doAfterSystem.DoAfter(doAfterEventArgs);
_doAfterSystem.DoAfter(doAfterEventArgs, new LockerDoAfterData());
}
private void OnRemoved(EntityUid uid, ResistLockerComponent component, EntRemovedFromContainerMessage args)
@@ -67,7 +67,7 @@ public sealed class ResistLockerSystem : EntitySystem
component.CancelToken = null;
}
private void OnDoAfter(EntityUid uid, ResistLockerComponent component, DoAfterEvent args)
private void OnDoAfter(EntityUid uid, ResistLockerComponent component, DoAfterEvent<LockerDoAfterData> args)
{
if (args.Cancelled)
{
@@ -96,4 +96,8 @@ public sealed class ResistLockerSystem : EntitySystem
component.CancelToken = null;
args.Handled = true;
}
private struct LockerDoAfterData
{
}
}