replace obsolete IsGrid calls with HasComp<MapGridComponent> (#36729)

* replace obsolete IsGrid calls with HasComp<MapGridComponent>

* remove IMapManager dependency

* well would you look at that

* just look at it
This commit is contained in:
Kyle Tyo
2025-04-20 00:14:58 -04:00
committed by GitHub
parent a6d2b1f0b8
commit 2c54ec10c6
3 changed files with 8 additions and 3 deletions

View File

@@ -16,6 +16,7 @@ using Robust.Shared;
using Robust.Shared.Configuration;
using Robust.Shared.Enums;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
using Robust.Shared.Player;
using Robust.Shared.Threading;
using Robust.Shared.Timing;
@@ -60,6 +61,7 @@ namespace Content.Server.Atmos.EntitySystems
private float _updateInterval;
private int _thresholds;
private EntityQuery<MapGridComponent> _gridQuery;
private EntityQuery<GasTileOverlayComponent> _query;
public override void Initialize()
@@ -76,6 +78,7 @@ namespace Content.Server.Atmos.EntitySystems
MapManager = _mapManager,
ChunkViewerPool = _chunkViewerPool,
LastSentChunks = _lastSentChunks,
GridQuery = _gridQuery,
};
_playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
@@ -86,6 +89,7 @@ namespace Content.Server.Atmos.EntitySystems
SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
SubscribeLocalEvent<GasTileOverlayComponent, ComponentStartup>(OnStartup);
_query = GetEntityQuery<GasTileOverlayComponent>();
_gridQuery = GetEntityQuery<MapGridComponent>();
}
private void OnStartup(EntityUid uid, GasTileOverlayComponent component, ComponentStartup args)
@@ -375,6 +379,8 @@ namespace Content.Server.Atmos.EntitySystems
public Dictionary<ICommonSession, Dictionary<NetEntity, HashSet<Vector2i>>> LastSentChunks;
public List<ICommonSession> Sessions;
public EntityQuery<MapGridComponent> GridQuery;
public void Execute(int index)
{
var playerSession = Sessions[index];
@@ -391,7 +397,7 @@ namespace Content.Server.Atmos.EntitySystems
previouslySent.Remove(netGrid);
// If grid was deleted then don't worry about sending it to the client.
if (!EntManager.TryGetEntity(netGrid, out var gridId) || !MapManager.IsGrid(gridId.Value))
if (!EntManager.TryGetEntity(netGrid, out var gridId) || GridQuery.HasComp(gridId.Value))
ev.RemovedChunks[netGrid] = oldIndices;
else
{