From 3840255ebba245f6ff36e0d72167622b4753d92a Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 12 Apr 2023 23:50:07 +1000 Subject: [PATCH] Fix thindow pathing (#15349) --- Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs index 827d6ba95b..ce48da0523 100644 --- a/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs +++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs @@ -472,7 +472,8 @@ public sealed partial class PathfindingSystem if (!fixturesQuery.TryGetComponent(ent, out var fixtures)) continue; - // TODO: Inefficient af + var colliding = false; + foreach (var fixture in fixtures.Fixtures.Values) { // Don't need to re-do it. @@ -505,8 +506,13 @@ public sealed partial class PathfindingSystem collisionLayer |= fixture.CollisionLayer; collisionMask |= fixture.CollisionMask; + colliding = true; } + // If entity doesn't intersect this node (e.g. thindows) then ignore it. + if (!colliding) + continue; + if (accessQuery.HasComponent(ent)) { flags |= PathfindingBreadcrumbFlag.Access; -- 2.51.2