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

Tile prying do_after (#6341)

Browse Source
This commit is contained in:
metalgearsloth
2022-01-30 14:48:18 +11:00
committed by GitHub
parent d7275f5c6b
commit e8b95dd88a
4 changed files with 125 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,7 @@ namespace Content.Server.DoAfter
UserGrid = entityManager.GetComponent<TransformComponent>(eventArgs.User).Coordinates;
}
if (eventArgs.BreakOnTargetMove)
if (eventArgs.Target != null && eventArgs.BreakOnTargetMove)
{
// Target should never be null if the bool is set.
TargetGrid = entityManager.GetComponent<TransformComponent>(eventArgs.Target!.Value).Coordinates;
@@ -122,8 +122,9 @@ namespace Content.Server.DoAfter
return true;
}
if (EventArgs.BreakOnTargetMove && !entityManager.GetComponent<TransformComponent>(EventArgs.Target!.Value).Coordinates.InRange(
entityManager, TargetGrid, EventArgs.MovementThreshold))
if (EventArgs.Target != null &&
EventArgs.BreakOnTargetMove &&
!entityManager.GetComponent<TransformComponent>(EventArgs.Target!.Value).Coordinates.InRange(entityManager, TargetGrid, EventArgs.MovementThreshold))
{
return true;
}