tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix NPC obstacle handling (#13007)

Browse Source
This commit is contained in:
metalgearsloth
2022-12-15 15:30:28 +11:00
committed by GitHub
parent 6fa2391e42
commit a5b04b49b6
8 changed files with 63 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
View File

@@ -86,7 +86,7 @@ public sealed partial class NPCSteeringSystem
}
else
{
arrivalDistance = SharedInteractionSystem.InteractionRange - 0.8f;
arrivalDistance = SharedInteractionSystem.InteractionRange - 0.65f;
}
// Check if mapids match.
@@ -105,9 +105,15 @@ public sealed partial class NPCSteeringSystem
if (direction.Length <= arrivalDistance)
{
// Node needs some kind of special handling like access or smashing.
if (steering.CurrentPath.TryPeek(out var node))
if (steering.CurrentPath.TryPeek(out var node) && !node.Data.IsFreeSpace)
{
var status = TryHandleFlags(steering, node, bodyQuery);
SteeringObstacleStatus status;
// Breaking behaviours and the likes.
lock (_obstacles)
{
status = TryHandleFlags(steering, node, bodyQuery);
}
// TODO: Need to handle re-pathing in case the target moves around.
switch (status)