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

DoAfterSystem uses EntityUid internally, adds EntityUid constructor for DoAfterEventArgs.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-09-28 11:33:33 +02:00
parent 35067b3a3e
commit 4e6d602784
4 changed files with 37 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Content.Server/DoAfter/DoAfter.cs
View File

@@ -34,25 +34,25 @@ namespace Content.Server.DoAfter
private readonly string? _activeHand; private readonly string? _activeHand;
private readonly ItemComponent? _activeItem; private readonly ItemComponent? _activeItem;
public DoAfter(DoAfterEventArgs eventArgs) public DoAfter(DoAfterEventArgs eventArgs, IEntityManager entityManager)
{ {
EventArgs = eventArgs; EventArgs = eventArgs;
StartTime = IoCManager.Resolve<IGameTiming>().CurTime; StartTime = IoCManager.Resolve<IGameTiming>().CurTime;
if (eventArgs.BreakOnUserMove) if (eventArgs.BreakOnUserMove)
{ {
UserGrid = eventArgs.User.Transform.Coordinates; UserGrid = entityManager.GetComponent<ITransformComponent>(eventArgs.User).Coordinates;
} }
if (eventArgs.BreakOnTargetMove) if (eventArgs.BreakOnTargetMove)
{ {
// Target should never be null if the bool is set. // Target should never be null if the bool is set.
TargetGrid = eventArgs.Target!.Transform.Coordinates; TargetGrid = entityManager.GetComponent<ITransformComponent>(eventArgs.Target!.Value).Coordinates;
} }
// For this we need to stay on the same hand slot and need the same item in that hand slot // For this we need to stay on the same hand slot and need the same item in that hand slot
// (or if there is no item there we need to keep it free). // (or if there is no item there we need to keep it free).
if (eventArgs.NeedHand && eventArgs.User.TryGetComponent(out HandsComponent? handsComponent)) if (eventArgs.NeedHand && entityManager.TryGetComponent(eventArgs.User, out HandsComponent? handsComponent))
{ {
_activeHand = handsComponent.ActiveHand; _activeHand = handsComponent.ActiveHand;
_activeItem = handsComponent.GetActiveHand; _activeItem = handsComponent.GetActiveHand;
@@ -62,7 +62,7 @@ namespace Content.Server.DoAfter
AsTask = Tcs.Task; AsTask = Tcs.Task;
} }
public void Run(float frameTime) public void Run(float frameTime, IEntityManager entityManager)
{ {
switch (Status) switch (Status)
{ {
@@ -92,15 +92,15 @@ namespace Content.Server.DoAfter
return; return;
} }
if (IsCancelled()) if (IsCancelled(entityManager))
{ {
Tcs.SetResult(DoAfterStatus.Cancelled); Tcs.SetResult(DoAfterStatus.Cancelled);
} }
} }
private bool IsCancelled() private bool IsCancelled(IEntityManager entityManager)
{ {
if (EventArgs.User.Deleted || EventArgs.Target?.Deleted == true) if (!entityManager.EntityExists(EventArgs.User) || EventArgs.Target is {} target && !entityManager.EntityExists(target))
{ {
return true; return true;
} }
@@ -112,14 +112,14 @@ namespace Content.Server.DoAfter
} }
// TODO :Handle inertia in space. // TODO :Handle inertia in space.
if (EventArgs.BreakOnUserMove && !EventArgs.User.Transform.Coordinates.InRange( if (EventArgs.BreakOnUserMove && !entityManager.GetComponent<ITransformComponent>(EventArgs.User).Coordinates.InRange(
EventArgs.User.EntityManager, UserGrid, EventArgs.MovementThreshold)) entityManager, UserGrid, EventArgs.MovementThreshold))
{ {
return true; return true;
} }
if (EventArgs.BreakOnTargetMove && !EventArgs.Target!.Transform.Coordinates.InRange( if (EventArgs.BreakOnTargetMove && !entityManager.GetComponent<ITransformComponent>(EventArgs.Target!.Value).Coordinates.InRange(
EventArgs.User.EntityManager, TargetGrid, EventArgs.MovementThreshold)) entityManager, TargetGrid, EventArgs.MovementThreshold))
{ {
return true; return true;
} }
@@ -135,7 +135,7 @@ namespace Content.Server.DoAfter
} }
if (EventArgs.BreakOnStun && if (EventArgs.BreakOnStun &&
EventArgs.User.TryGetComponent(out StunnableComponent? stunnableComponent) && entityManager.TryGetComponent(EventArgs.User, out StunnableComponent? stunnableComponent) &&
stunnableComponent.Stunned) stunnableComponent.Stunned)
{ {
return true; return true;
@@ -143,7 +143,7 @@ namespace Content.Server.DoAfter
if (EventArgs.NeedHand) if (EventArgs.NeedHand)
{ {
if (!EventArgs.User.TryGetComponent(out HandsComponent? handsComponent)) if (!entityManager.TryGetComponent(EventArgs.User, out HandsComponent? handsComponent))
{ {
// If we had a hand but no longer have it that's still a paddlin' // If we had a hand but no longer have it that's still a paddlin'
if (_activeHand != null) if (_activeHand != null)

2
Content.Server/DoAfter/DoAfterComponent.cs
View File

@@ -31,7 +31,7 @@ namespace Content.Server.DoAfter
doAfter.EventArgs.BreakOnUserMove, doAfter.EventArgs.BreakOnUserMove,
doAfter.EventArgs.BreakOnTargetMove, doAfter.EventArgs.BreakOnTargetMove,
doAfter.EventArgs.MovementThreshold, doAfter.EventArgs.MovementThreshold,
doAfter.EventArgs.Target?.Uid ?? EntityUid.Invalid); doAfter.EventArgs.Target ?? EntityUid.Invalid);
toAdd.Add(clientDoAfter); toAdd.Add(clientDoAfter);
} }

26
Content.Server/DoAfter/DoAfterEventArgs.cs
View File

@@ -10,22 +10,10 @@ namespace Content.Server.DoAfter
{ {
public sealed class DoAfterEventArgs public sealed class DoAfterEventArgs
{ {
// Premade checks
public Func<bool> GetInRangeUnobstructed(CollisionGroup collisionMask = CollisionGroup.MobMask)
{
if (Target == null)
{
throw new InvalidOperationException("Can't supply a null target to DoAfterEventArgs.GetInRangeUnobstructed");
}
bool Ignored(IEntity entity) => entity == User || entity == Target;
return () => User.InRangeUnobstructed(Target, collisionMask: collisionMask, predicate: Ignored);
}
/// <summary> /// <summary>
/// The entity invoking do_after /// The entity invoking do_after
/// </summary> /// </summary>
public IEntity User { get; } public EntityUid User { get; }
/// <summary> /// <summary>
/// How long does the do_after require to complete /// How long does the do_after require to complete
@@ -35,7 +23,7 @@ namespace Content.Server.DoAfter
/// <summary> /// <summary>
/// Applicable target (if relevant) /// Applicable target (if relevant)
/// </summary> /// </summary>
public IEntity? Target { get; } public EntityUid? Target { get; }
/// <summary> /// <summary>
/// Manually cancel the do_after so it no longer runs /// Manually cancel the do_after so it no longer runs
@@ -114,7 +102,15 @@ namespace Content.Server.DoAfter
IEntity user, IEntity user,
float delay, float delay,
CancellationToken cancelToken = default, CancellationToken cancelToken = default,
IEntity? target = null) IEntity? target = null) : this(user.Uid, delay, cancelToken, target?.Uid ?? null)
{
}
public DoAfterEventArgs(
EntityUid user,
float delay,
CancellationToken cancelToken = default,
EntityUid? target = null)
{ {
User = user; User = user;
Delay = delay; Delay = delay;

22
Content.Server/DoAfter/DoAfterSystem.cs
View File

@@ -45,7 +45,7 @@ namespace Content.Server.DoAfter
{ {
foreach (var doAfter in comp.DoAfters.ToArray()) foreach (var doAfter in comp.DoAfters.ToArray())
{ {
doAfter.Run(frameTime); doAfter.Run(frameTime, EntityManager);
switch (doAfter.Status) switch (doAfter.Status)
{ {
@@ -66,11 +66,11 @@ namespace Content.Server.DoAfter
{ {
comp.Cancelled(doAfter); comp.Cancelled(doAfter);
if(!doAfter.EventArgs.User.Deleted && doAfter.EventArgs.UserCancelledEvent != null) if(EntityManager.EntityExists(doAfter.EventArgs.User) && doAfter.EventArgs.UserCancelledEvent != null)
RaiseLocalEvent(doAfter.EventArgs.User.Uid, doAfter.EventArgs.UserCancelledEvent, false); RaiseLocalEvent(doAfter.EventArgs.User, doAfter.EventArgs.UserCancelledEvent, false);
if(doAfter.EventArgs.Target is { Deleted: false } && doAfter.EventArgs.TargetCancelledEvent != null) if(doAfter.EventArgs.Target is {} target && EntityManager.EntityExists(target) && doAfter.EventArgs.TargetCancelledEvent != null)
RaiseLocalEvent(doAfter.EventArgs.Target.Uid, doAfter.EventArgs.TargetCancelledEvent, false); RaiseLocalEvent(target, doAfter.EventArgs.TargetCancelledEvent, false);
if(doAfter.EventArgs.BroadcastCancelledEvent != null) if(doAfter.EventArgs.BroadcastCancelledEvent != null)
RaiseLocalEvent(doAfter.EventArgs.BroadcastCancelledEvent); RaiseLocalEvent(doAfter.EventArgs.BroadcastCancelledEvent);
@@ -80,11 +80,11 @@ namespace Content.Server.DoAfter
{ {
comp.Finished(doAfter); comp.Finished(doAfter);
if(!doAfter.EventArgs.User.Deleted && doAfter.EventArgs.UserFinishedEvent != null) if(EntityManager.EntityExists(doAfter.EventArgs.User) && doAfter.EventArgs.UserFinishedEvent != null)
RaiseLocalEvent(doAfter.EventArgs.User.Uid, doAfter.EventArgs.UserFinishedEvent, false); RaiseLocalEvent(doAfter.EventArgs.User, doAfter.EventArgs.UserFinishedEvent, false);
if(doAfter.EventArgs.Target is { Deleted: false } && doAfter.EventArgs.TargetFinishedEvent != null) if(doAfter.EventArgs.Target is {} target && EntityManager.EntityExists(target) && doAfter.EventArgs.TargetFinishedEvent != null)
RaiseLocalEvent(doAfter.EventArgs.Target.Uid, doAfter.EventArgs.TargetFinishedEvent, false); RaiseLocalEvent(target, doAfter.EventArgs.TargetFinishedEvent, false);
if(doAfter.EventArgs.BroadcastFinishedEvent != null) if(doAfter.EventArgs.BroadcastFinishedEvent != null)
RaiseLocalEvent(doAfter.EventArgs.BroadcastFinishedEvent); RaiseLocalEvent(doAfter.EventArgs.BroadcastFinishedEvent);
@@ -124,9 +124,9 @@ namespace Content.Server.DoAfter
private DoAfter CreateDoAfter(DoAfterEventArgs eventArgs) private DoAfter CreateDoAfter(DoAfterEventArgs eventArgs)
{ {
// Setup // Setup
var doAfter = new DoAfter(eventArgs); var doAfter = new DoAfter(eventArgs, EntityManager);
// Caller's gonna be responsible for this I guess // Caller's gonna be responsible for this I guess
var doAfterComponent = eventArgs.User.GetComponent<DoAfterComponent>(); var doAfterComponent = EntityManager.GetComponent<DoAfterComponent>(eventArgs.User);
doAfterComponent.Add(doAfter); doAfterComponent.Add(doAfter);
return doAfter; return doAfter;
} }