tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
View File

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

2
Content.Shared/Movement/Systems/SharedMoverController.Input.cs
View File

@@ -214,7 +214,7 @@ namespace Content.Shared.Movement.Systems
} }
// If we went from grid -> grid OR grid -> map then snap the target to cardinal and lerp there. // If we went from grid -> grid OR grid -> map then snap the target to cardinal and lerp there.
// OR just rotate to zero (depending on cvar) // OR just rotate to zero (depending on cvar)
else if (relative != null && _mapManager.IsGrid(relative.Value)) else if (relative != null && MapGridQuery.HasComp(relative.Value))
{ {
if (CameraRotationLocked) if (CameraRotationLocked)
targetRotation = Angle.Zero; targetRotation = Angle.Zero;

1
Content.Shared/Movement/Systems/SharedMoverController.cs
View File

@@ -35,7 +35,6 @@ public abstract partial class SharedMoverController : VirtualController
{ {
[Dependency] private readonly IConfigurationManager _configManager = default!; [Dependency] private readonly IConfigurationManager _configManager = default!;
[Dependency] protected readonly IGameTiming Timing = default!; [Dependency] protected readonly IGameTiming Timing = default!;
[Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!; [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
[Dependency] private readonly EntityLookupSystem _lookup = default!; [Dependency] private readonly EntityLookupSystem _lookup = default!;
[Dependency] private readonly InventorySystem _inventory = default!; [Dependency] private readonly InventorySystem _inventory = default!;