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

Remove NPC IEntityManager resolves (#12648)

Browse Source
This commit is contained in:
metalgearsloth
2022-11-19 08:07:52 +11:00
committed by GitHub
parent c58204255f
commit b749d0d275
16 changed files with 46 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/NPC/Pathfinding/PathfindingSystem.cs
View File

@@ -131,7 +131,6 @@ namespace Content.Server.NPC.Pathfinding
switch (result)
{
case PathResult.Continuing:
DebugTools.Assert(path.Frontier.Count > 0);
break;
case PathResult.PartialPath:
case PathResult.Path:
@@ -409,17 +408,17 @@ namespace Content.Server.NPC.Pathfinding
{
var flags = PathFlags.None;
if (blackboard.TryGetValue<bool>(NPCBlackboard.NavPry, out var pry) && pry)
if (blackboard.TryGetValue<bool>(NPCBlackboard.NavPry, out var pry, EntityManager) && pry)
{
flags |= PathFlags.Prying;
}
if (blackboard.TryGetValue<bool>(NPCBlackboard.NavSmash, out var smash) && smash)
if (blackboard.TryGetValue<bool>(NPCBlackboard.NavSmash, out var smash, EntityManager) && smash)
{
flags |= PathFlags.Smashing;
}
if (blackboard.TryGetValue<bool>(NPCBlackboard.NavInteract, out var interact) && interact)
if (blackboard.TryGetValue<bool>(NPCBlackboard.NavInteract, out var interact, EntityManager) && interact)
{
flags |= PathFlags.Interact;
}