]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Entitylookup method renames (#23519)
authormetalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Sun, 14 Jan 2024 08:10:38 +0000 (19:10 +1100)
committerGitHub <noreply@github.com>
Sun, 14 Jan 2024 08:10:38 +0000 (19:10 +1100)
Content.Server/Abilities/Mime/MimePowersSystem.cs
Content.Server/Chemistry/TileReactions/CleanTileReaction.cs
Content.Server/Electrocution/ElectrocutionSystem.cs
Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs
Content.Server/Physics/Controllers/ConveyorController.cs
Content.Shared/Blocking/BlockingSystem.cs

index abc3b080fc195f0ed5d88255846a0d9fd265c20b..97ab7f4aa0a47205ca14477f11548c324af967f0 100644 (file)
@@ -84,7 +84,7 @@ namespace Content.Server.Abilities.Mime
             }
 
             // Check there are no mobs there
-            foreach (var entity in _lookupSystem.GetEntitiesIntersecting(tile.Value, 0f))
+            foreach (var entity in _lookupSystem.GetLocalEntitiesIntersecting(tile.Value, 0f))
             {
                 if (HasComp<MobStateComponent>(entity) && entity != uid)
                 {
index 9d358de07ee9205d681cf9f7964f6db69bd8866c..3f5ae63c365dc56eccfcfada9a9fffcaf91119bc 100644 (file)
@@ -34,7 +34,7 @@ public sealed partial class CleanTileReaction : ITileReaction
     FixedPoint2 ITileReaction.TileReact(TileRef tile, ReagentPrototype reagent, FixedPoint2 reactVolume)
     {
         var entMan = IoCManager.Resolve<IEntityManager>();
-        var entities = entMan.System<EntityLookupSystem>().GetEntitiesIntersecting(tile, 0f).ToArray();
+        var entities = entMan.System<EntityLookupSystem>().GetLocalEntitiesIntersecting(tile, 0f).ToArray();
         var puddleQuery = entMan.GetEntityQuery<PuddleComponent>();
         var solutionContainerSystem = entMan.System<SolutionContainerSystem>();
         // Multiply as the amount we can actually purge is higher than the react amount.
index c3ae24607445e193ab1a89f420cf54cdc4913f66..11e56a65c4b18ba509e3823e377c79606f5b63be 100644 (file)
@@ -150,7 +150,7 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem
 
             if (tileRef != null)
             {
-                foreach (var entity in _entityLookup.GetEntitiesIntersecting(tileRef.Value, flags: LookupFlags.StaticSundries))
+                foreach (var entity in _entityLookup.GetLocalEntitiesIntersecting(tileRef.Value, flags: LookupFlags.StaticSundries))
                 {
                     if (_tag.HasTag(entity, "Window"))
                         return false;
index 075011171fef7c93601063e50d2f75debf5997bd..c27947dedb1f230dd65208ee3ea5308e30b7b1bf 100644 (file)
@@ -436,7 +436,7 @@ public sealed partial class PathfindingSystem
                 // var isBorder = x < 0 || y < 0 || x == ChunkSize - 1 || y == ChunkSize - 1;
 
                 tileEntities.Clear();
-                var available = _lookup.GetEntitiesIntersecting(tile, flags: LookupFlags.Dynamic | LookupFlags.Static);
+                var available = _lookup.GetLocalEntitiesIntersecting(tile, flags: LookupFlags.Dynamic | LookupFlags.Static);
 
                 foreach (var ent in available)
                 {
index d0a741ec76863748465af23cf7ad83733e8de72b..42279bb7496ee39fed3d68d9bd1a5b96a6cf0dd9 100644 (file)
@@ -125,7 +125,7 @@ public sealed class ConveyorController : SharedConveyorController
 
         if (beltTileRef != null)
         {
-            var intersecting = Lookup.GetEntitiesIntersecting(beltTileRef.Value, 0f);
+            var intersecting = Lookup.GetLocalEntitiesIntersecting(beltTileRef.Value, 0f);
 
             foreach (var entity in intersecting)
             {
index d616d55eb92187dd0fcb55f22bf3cbe4786beae5..f2d41e5be953f34c606233b99d14409ddd6797d7 100644 (file)
@@ -177,7 +177,7 @@ public sealed partial class BlockingSystem : EntitySystem
             var playerTileRef = xform.Coordinates.GetTileRef();
             if (playerTileRef != null)
             {
-                var intersecting = _lookup.GetEntitiesIntersecting(playerTileRef.Value, 0f);
+                var intersecting = _lookup.GetLocalEntitiesIntersecting(playerTileRef.Value, 0f);
                 var mobQuery = GetEntityQuery<MobStateComponent>();
                 foreach (var uid in intersecting)
                 {