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

Fix rat pathfinding (#12951)

Browse Source 
Fixes https://github.com/space-wizards/space-station-14/issues/12950
This commit is contained in:
metalgearsloth
2022-12-10 20:31:02 +11:00
committed by GitHub
parent 0db20ee8be
commit f8a8b41976
4 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Content.Server/NPC/Systems/NPCSteeringSystem.Obstacles.cs
View File

@@ -4,6 +4,7 @@ using Content.Server.NPC.Pathfinding;
using Content.Shared.Doors.Components;
using Content.Shared.NPC;
using Content.Shared.Weapons.Melee;
using Robust.Shared.Physics;
using Robust.Shared.Physics.Components;
namespace Content.Server.NPC.Systems;
@@ -35,20 +36,29 @@ public sealed partial class NPCSteeringSystem
if (poly.Data.IsFreeSpace)
return SteeringObstacleStatus.Completed;
if (!bodyQuery.TryGetComponent(component.Owner, out var body))
return SteeringObstacleStatus.Failed;
// TODO: Store PathFlags on the steering comp
// and be able to re-check it.
var layer = 0;
var mask = 0;
if (TryComp<FixturesComponent>(component.Owner, out var manager))
{
(layer, mask) = _physics.GetHardCollision(component.Owner, manager);
}
else
{
return SteeringObstacleStatus.Failed;
}
// TODO: Should cache the fact we're doing this somewhere.
// See https://github.com/space-wizards/space-station-14/issues/11475
if ((poly.Data.CollisionLayer & body.CollisionMask) != 0x0 ||
(poly.Data.CollisionMask & body.CollisionLayer) != 0x0)
if ((poly.Data.CollisionLayer & mask) != 0x0 ||
(poly.Data.CollisionMask & layer) != 0x0)
{
var obstacleEnts = new List<EntityUid>();
GetObstacleEntities(poly, body.CollisionMask, body.CollisionLayer, bodyQuery, obstacleEnts);
GetObstacleEntities(poly, mask, layer, bodyQuery, obstacleEnts);
var isDoor = (poly.Data.Flags & PathfindingBreadcrumbFlag.Door) != 0x0;
var isAccess = (poly.Data.Flags & PathfindingBreadcrumbFlag.Access) != 0x0;