More DoAfter Changes (#14609)
* DoAfters * Compact Clone() * Fix mice and cuffables * Try generalize attempt events * moves climbabledoafter event to shared, fixes issue with climbable target * Fix merge (cuffing) * Make all events netserializable * handful of doafter events moved * moves the rest of the events to their respective shared folders * Changes all mentions of server doafter to shared * stop stripping cancellation * fix merge errors * draw paused doafters * handle unpausing * missing netserializable ref * removes break on stun reference * removes cuffing state reference * Fix tools * Fix door prying. * Fix construction * Fix dumping * Fix wielding assert * fix rev * Fix test * more test fixes --------- Co-authored-by: keronshb <keronshb@live.com>
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
using Content.Server.Coordinates.Helpers;
|
||||
using Content.Server.DoAfter;
|
||||
using Content.Server.Engineering.Components;
|
||||
using Content.Server.Stack;
|
||||
using Content.Shared.DoAfter;
|
||||
@@ -15,7 +14,7 @@ namespace Content.Server.Engineering.EntitySystems
|
||||
public sealed class SpawnAfterInteractSystem : EntitySystem
|
||||
{
|
||||
[Dependency] private readonly IMapManager _mapManager = default!;
|
||||
[Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
|
||||
[Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
|
||||
[Dependency] private readonly StackSystem _stackSystem = default!;
|
||||
|
||||
public override void Initialize()
|
||||
@@ -46,11 +45,9 @@ namespace Content.Server.Engineering.EntitySystems
|
||||
|
||||
if (component.DoAfterTime > 0)
|
||||
{
|
||||
var doAfterArgs = new DoAfterEventArgs(args.User, component.DoAfterTime)
|
||||
var doAfterArgs = new DoAfterArgs(args.User, component.DoAfterTime, new AwaitedDoAfterEvent(), null)
|
||||
{
|
||||
BreakOnUserMove = true,
|
||||
BreakOnStun = true,
|
||||
PostCheck = IsTileClear,
|
||||
};
|
||||
var result = await _doAfterSystem.WaitDoAfter(doAfterArgs);
|
||||
|
||||
@@ -58,7 +55,7 @@ namespace Content.Server.Engineering.EntitySystems
|
||||
return;
|
||||
}
|
||||
|
||||
if (component.Deleted || Deleted(component.Owner))
|
||||
if (component.Deleted || !IsTileClear())
|
||||
return;
|
||||
|
||||
if (EntityManager.TryGetComponent<StackComponent?>(component.Owner, out var stackComp)
|
||||
|
||||
Reference in New Issue
Block a user