From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 14 Jan 2024 08:10:38 +0000 (+1100) Subject: Entitylookup method renames (#23519) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=1f3a29c0926c2d3af7ce1ef8148a73d332c3302f;p=space-station-14.git Entitylookup method renames (#23519) --- diff --git a/Content.Server/Abilities/Mime/MimePowersSystem.cs b/Content.Server/Abilities/Mime/MimePowersSystem.cs index abc3b080fc..97ab7f4aa0 100644 --- a/Content.Server/Abilities/Mime/MimePowersSystem.cs +++ b/Content.Server/Abilities/Mime/MimePowersSystem.cs @@ -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(entity) && entity != uid) { diff --git a/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs b/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs index 9d358de07e..3f5ae63c36 100644 --- a/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs +++ b/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs @@ -34,7 +34,7 @@ public sealed partial class CleanTileReaction : ITileReaction FixedPoint2 ITileReaction.TileReact(TileRef tile, ReagentPrototype reagent, FixedPoint2 reactVolume) { var entMan = IoCManager.Resolve(); - var entities = entMan.System().GetEntitiesIntersecting(tile, 0f).ToArray(); + var entities = entMan.System().GetLocalEntitiesIntersecting(tile, 0f).ToArray(); var puddleQuery = entMan.GetEntityQuery(); var solutionContainerSystem = entMan.System(); // Multiply as the amount we can actually purge is higher than the react amount. diff --git a/Content.Server/Electrocution/ElectrocutionSystem.cs b/Content.Server/Electrocution/ElectrocutionSystem.cs index c3ae246074..11e56a65c4 100644 --- a/Content.Server/Electrocution/ElectrocutionSystem.cs +++ b/Content.Server/Electrocution/ElectrocutionSystem.cs @@ -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; diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs index 075011171f..c27947dedb 100644 --- a/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs +++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs @@ -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) { diff --git a/Content.Server/Physics/Controllers/ConveyorController.cs b/Content.Server/Physics/Controllers/ConveyorController.cs index d0a741ec76..42279bb749 100644 --- a/Content.Server/Physics/Controllers/ConveyorController.cs +++ b/Content.Server/Physics/Controllers/ConveyorController.cs @@ -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) { diff --git a/Content.Shared/Blocking/BlockingSystem.cs b/Content.Shared/Blocking/BlockingSystem.cs index d616d55eb9..f2d41e5be9 100644 --- a/Content.Shared/Blocking/BlockingSystem.cs +++ b/Content.Shared/Blocking/BlockingSystem.cs @@ -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(); foreach (var uid in intersecting) {