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

5
Content.Shared/DoAfter/SharedDoAfterSystem.cs
View File

@@ -179,19 +179,16 @@ public abstract class SharedDoAfterSystem : EntitySystem
/// Use this if you don't have any extra data to send with the DoAfter
/// </summary>
/// <param name="eventArgs">The DoAfterEventArgs</param>
public DoAfter DoAfter(DoAfterEventArgs eventArgs)
public void DoAfter(DoAfterEventArgs eventArgs)
{
var doAfter = CreateDoAfter(eventArgs);
doAfter.Done = cancelled => { Send(cancelled, eventArgs); };
return doAfter;
}
private DoAfter CreateDoAfter(DoAfterEventArgs eventArgs)
{
// Setup
eventArgs.CancelToken = new CancellationToken();
var doAfter = new DoAfter(eventArgs, EntityManager);
// Caller's gonna be responsible for this I guess
var doAfterComponent = Comp<DoAfterComponent>(eventArgs.User);