]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix thindow pathing (#15349)
authormetalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Wed, 12 Apr 2023 13:50:07 +0000 (23:50 +1000)
committerGitHub <noreply@github.com>
Wed, 12 Apr 2023 13:50:07 +0000 (23:50 +1000)
Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs

index 827d6ba95b97c6b48e358ee2c1176a4f0b3c5568..ce48da0523265dc99791288ca3f8abb0d843ffd1 100644 (file)
@@ -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;