Replace obsolete functions in NPC systems (#31448)

diff --git a/Content.Server/NPC/Systems/NPCJukeSystem.cs b/Content.Server/NPC/Systems/NPCJukeSystem.cs
index 94a30feb0cb2423d317face141631c2e576923a1..1b2f4f53578e619a3b012ad8556187f394ab5ebd 100644 (file)
--- a/Content.Server/NPC/Systems/NPCJukeSystem.cs
+++ b/Content.Server/NPC/Systems/NPCJukeSystem.cs
@@ -20,6 +20,7 @@ public sealed class NPCJukeSystem : EntitySystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly MeleeWeaponSystem _melee = default!;
+    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     private EntityQuery<NPCMeleeCombatComponent> _npcMeleeQuery;
@@ -59,7 +60,7 @@ public sealed class NPCJukeSystem : EntitySystem
                 return;
             }
 
-            var currentTile = grid.CoordinatesToTile(args.Transform.Coordinates);
+            var currentTile = _mapSystem.CoordinatesToTile(args.Transform.GridUid.Value, grid, args.Transform.Coordinates);
 
             if (component.TargetTile == null)
             {
@@ -72,7 +73,7 @@ public sealed class NPCJukeSystem : EntitySystem
                 for (var i = 0; i < 8; i++)
                 {
                     var index = (startIndex + i) % 8;
-                    var neighbor = ((Direction) index).ToIntVec() + currentTile;
+                    var neighbor = ((Direction)index).ToIntVec() + currentTile;
                     var valid = true;
 
                     // TODO: Probably make this a helper on engine maybe
@@ -116,7 +117,7 @@ public sealed class NPCJukeSystem : EntitySystem
                 return;
             }
 
-            var targetCoords = grid.GridTileToWorld(component.TargetTile.Value);
+            var targetCoords = _mapSystem.GridTileToWorld(args.Transform.GridUid.Value, grid, component.TargetTile.Value);
             var targetDir = (targetCoords.Position - args.WorldPosition);
             targetDir = args.OffsetRotation.RotateVec(targetDir);
             const float weight = 1f;

diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
index e0bcb97a112c2cac01e85c172e60b716d44852ee..fa43b3e7524b59300a297973a7452e6fd5d474c0 100644 (file)
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
@@ -22,7 +22,7 @@ public sealed partial class NPCSteeringSystem
         if (weight == 0f || direction == Vector2.Zero)
             return;
 
-        var directionAngle = (float) direction.ToAngle().Theta;
+        var directionAngle = (float)direction.ToAngle().Theta;
 
         for (var i = 0; i < InterestDirections; i++)
         {
@@ -166,8 +166,8 @@ public sealed partial class NPCSteeringSystem
         }
 
         // Check if mapids match.
-        var targetMap = targetCoordinates.ToMap(EntityManager, _transform);
-        var ourMap = ourCoordinates.ToMap(EntityManager, _transform);
+        var targetMap = _transform.ToMapCoordinates(targetCoordinates);
+        var ourMap = _transform.ToMapCoordinates(ourCoordinates);
 
         if (targetMap.MapId != ourMap.MapId)
         {
@@ -258,7 +258,7 @@ public sealed partial class NPCSteeringSystem
                     return false;
                 }
 
-                targetMap = targetCoordinates.ToMap(EntityManager, _transform);
+                targetMap = _transform.ToMapCoordinates(targetCoordinates);
 
                 // Can't make it again.
                 if (ourMap.MapId != targetMap.MapId)
@@ -429,7 +429,7 @@ public sealed partial class NPCSteeringSystem
 
         if (TryComp<PhysicsComponent>(uid, out var physics))
         {
-            mask = (CollisionGroup) physics.CollisionMask;
+            mask = (CollisionGroup)physics.CollisionMask;
         }
 
         for (var i = 0; i < nodes.Count; i++)
@@ -439,7 +439,7 @@ public sealed partial class NPCSteeringSystem
             if (!node.Data.IsFreeSpace)
                 break;
 
-            var nodeMap = node.Coordinates.ToMap(EntityManager, _transform);
+            var nodeMap = _transform.ToMapCoordinates(node.Coordinates);
 
             // If any nodes are 'behind us' relative to the target we'll prune them.
             // This isn't perfect but should fix most cases of stutter stepping.

diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.Obstacles.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.Obstacles.cs
index 3bc4eae9e494e8f8dbb6b676598030207981b26c..a31c7850f3846a9637998521d90a971740143ea5 100644 (file)
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.Obstacles.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.Obstacles.cs
@@ -207,7 +207,7 @@ public sealed partial class NPCSteeringSystem
             return;
         }
 
-        foreach (var ent in grid.GetLocalAnchoredEntities(poly.Box))
+        foreach (var ent in _mapSystem.GetLocalAnchoredEntities(poly.GraphUid, grid, poly.Box))
         {
             if (!_physicsQuery.TryGetComponent(ent, out var body) ||
                 !body.Hard ||

diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.cs
index a77af941743078a69bd954843d1a8cadc27b2f62..fc63d1e6156a5d9f2a1fe72f878b28048b999ecb 100644 (file)
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.cs
@@ -54,6 +54,7 @@ public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem
     [Dependency] private readonly NpcFactionSystem _npcFaction = default!;
     [Dependency] private readonly PathfindingSystem _pathfindingSystem = default!;
     [Dependency] private readonly PryingSystem _pryingSystem = default!;
+    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
     [Dependency] private readonly SharedMeleeWeaponSystem _melee = default!;
     [Dependency] private readonly SharedMoverController _mover = default!;