diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs index c9e217b170..7a15ba3413 100644 --- a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs +++ b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs @@ -270,7 +270,7 @@ public sealed class EventHorizonSystem : SharedEventHorizonSystem var toConsume = new List<(Vector2i, Tile)>(); foreach (var tile in tiles) { - if (CanConsumeTile(hungry, tile, grid, eventHorizon)) + if (CanConsumeTile((hungry, eventHorizon), tile, (gridId, grid))) toConsume.Add((tile.GridIndices, Tile.Empty)); } @@ -284,16 +284,23 @@ public sealed class EventHorizonSystem : SharedEventHorizonSystem /// Checks whether an event horizon can consume a given tile. /// This is only possible if it can also consume all entities anchored to the tile. /// - public bool CanConsumeTile(EntityUid hungry, TileRef tile, MapGridComponent grid, EventHorizonComponent eventHorizon) + public bool CanConsumeTile(Entity hungry, TileRef tile, Entity grid) { - foreach (var blockingEntity in grid.GetAnchoredEntities(tile.GridIndices)) + foreach (var blockingEntity in _mapSystem.GetAnchoredEntities(grid, tile.GridIndices)) { - if (!CanConsumeEntity(hungry, blockingEntity, eventHorizon)) + if (!CanConsumeEntity(hungry, blockingEntity, hungry.Comp)) return false; } return true; } + /// + [Obsolete("Use the Entity overload")] + public bool CanConsumeTile(EntityUid hungry, TileRef tile, MapGridComponent grid, EventHorizonComponent eventHorizon) + { + return CanConsumeTile((hungry, eventHorizon), tile, (grid.Owner, grid)); + } + /// /// Consumes all tiles within a given distance of an entity. /// Some entities are immune to consumption.