Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

2
Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/MedibotInjectOperator.cs
View File

@@ -44,7 +44,7 @@ public sealed class MedibotInjectOperator : HTNOperator
// TODO: Wat
var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
if (!blackboard.TryGetValue<EntityUid>(TargetKey, out var target) || _entManager.Deleted(target))
if (!blackboard.TryGetValue<EntityUid>(TargetKey, out var target, _entManager) || _entManager.Deleted(target))
return HTNOperatorStatus.Failed;
if (!_entManager.TryGetComponent<MedibotComponent>(owner, out var botComp))

2
Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyInjectableOperator.cs
View File

@@ -41,7 +41,7 @@ public sealed class PickNearbyInjectableOperator : HTNOperator
{
var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
if (!blackboard.TryGetValue<float>(RangeKey, out var range))
if (!blackboard.TryGetValue<float>(RangeKey, out var range, _entManager))
return (false, null);
var damageQuery = _entManager.GetEntityQuery<DamageableComponent>();