diff --git a/Content.Client/AI/ClientAiDebugSystem.cs b/Content.Client/AI/ClientAiDebugSystem.cs index 3abfee6e36..eb7501ee82 100644 --- a/Content.Client/AI/ClientAiDebugSystem.cs +++ b/Content.Client/AI/ClientAiDebugSystem.cs @@ -40,19 +40,19 @@ namespace Content.Client.AI var deletedEntities = new List(0); foreach (var (entity, panel) in _aiBoxes) { - if ((!IoCManager.Resolve().EntityExists(entity) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(entity).EntityLifeStage) >= EntityLifeStage.Deleted) + if ((!EntityManager.EntityExists(entity) ? EntityLifeStage.Deleted : EntityManager.GetComponent(entity).EntityLifeStage) >= EntityLifeStage.Deleted) { deletedEntities.Add(entity); continue; } - if (!_eyeManager.GetWorldViewport().Contains(IoCManager.Resolve().GetComponent(entity).WorldPosition)) + if (!_eyeManager.GetWorldViewport().Contains(EntityManager.GetComponent(entity).WorldPosition)) { panel.Visible = false; continue; } - var (x, y) = _eyeManager.CoordinatesToScreen(IoCManager.Resolve().GetComponent(entity).Coordinates).Position; + var (x, y) = _eyeManager.CoordinatesToScreen(EntityManager.GetComponent(entity).Coordinates).Position; var offsetPosition = new Vector2(x - panel.Width / 2, y - panel.Height - 50f); panel.Visible = true; diff --git a/Content.Server/AI/Pathfinding/Accessible/AiReachableSystem.cs b/Content.Server/AI/Pathfinding/Accessible/AiReachableSystem.cs index 6b5912f0b2..cefdd62620 100644 --- a/Content.Server/AI/Pathfinding/Accessible/AiReachableSystem.cs +++ b/Content.Server/AI/Pathfinding/Accessible/AiReachableSystem.cs @@ -173,14 +173,14 @@ namespace Content.Server.AI.Pathfinding.Accessible public bool CanAccess(EntityUid entity, EntityUid target, float range = 0.0f) { // TODO: Handle this gracefully instead of just failing. - if (!IoCManager.Resolve().GetComponent(target).GridID.IsValid()) + if (!EntityManager.GetComponent(target).GridID.IsValid()) return false; - var targetTile = _mapManager.GetGrid(IoCManager.Resolve().GetComponent(target).GridID).GetTileRef(IoCManager.Resolve().GetComponent(target).Coordinates); + var targetTile = _mapManager.GetGrid(EntityManager.GetComponent(target).GridID).GetTileRef(EntityManager.GetComponent(target).Coordinates); var targetNode = _pathfindingSystem.GetNode(targetTile); var collisionMask = 0; - if (IoCManager.Resolve().TryGetComponent(entity, out IPhysBody? physics)) + if (EntityManager.TryGetComponent(entity, out IPhysBody? physics)) { collisionMask = physics.CollisionMask; } @@ -209,12 +209,12 @@ namespace Content.Server.AI.Pathfinding.Accessible public bool CanAccess(EntityUid entity, PathfindingNode targetNode) { - if (IoCManager.Resolve().GetComponent(entity).GridID != targetNode.TileRef.GridIndex) + if (EntityManager.GetComponent(entity).GridID != targetNode.TileRef.GridIndex) { return false; } - var entityTile = _mapManager.GetGrid(IoCManager.Resolve().GetComponent(entity).GridID).GetTileRef(IoCManager.Resolve().GetComponent(entity).Coordinates); + var entityTile = _mapManager.GetGrid(EntityManager.GetComponent(entity).GridID).GetTileRef(IoCManager.Resolve().GetComponent(entity).Coordinates); var entityNode = _pathfindingSystem.GetNode(entityTile); var entityRegion = GetRegion(entityNode); var targetRegion = GetRegion(targetNode); diff --git a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs index 20172009af..4a481f0195 100644 --- a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs +++ b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs @@ -27,15 +27,17 @@ namespace Content.Server.Atmos.EntitySystems private void OnAirtightInit(EntityUid uid, AirtightComponent airtight, ComponentInit args) { + var xform = EntityManager.GetComponent(uid); + if (airtight.FixAirBlockedDirectionInitialize) { - var rotateEvent = new RotateEvent(airtight.Owner, Angle.Zero, IoCManager.Resolve().GetComponent(airtight.Owner).WorldRotation); + var rotateEvent = new RotateEvent(airtight.Owner, Angle.Zero, xform.WorldRotation); OnAirtightRotated(uid, airtight, ref rotateEvent); } // Adding this component will immediately anchor the entity, because the atmos system // requires airtight entities to be anchored for performance. - IoCManager.Resolve().GetComponent(airtight.Owner).Anchored = true; + xform.Anchored = true; UpdatePosition(airtight); } @@ -54,8 +56,10 @@ namespace Content.Server.Atmos.EntitySystems private void OnAirtightPositionChanged(EntityUid uid, AirtightComponent airtight, ref AnchorStateChangedEvent args) { - var gridId = IoCManager.Resolve().GetComponent(airtight.Owner).GridID; - var coords = IoCManager.Resolve().GetComponent(airtight.Owner).Coordinates; + var xform = EntityManager.GetComponent(uid); + + var gridId = xform.GridID; + var coords = xform.Coordinates; var grid = _mapManager.GetGrid(gridId); var tilePos = grid.TileIndicesFor(coords); @@ -84,11 +88,13 @@ namespace Content.Server.Atmos.EntitySystems public void UpdatePosition(AirtightComponent airtight) { - if (!IoCManager.Resolve().GetComponent(airtight.Owner).Anchored || !IoCManager.Resolve().GetComponent(airtight.Owner).GridID.IsValid()) + var xform = EntityManager.GetComponent(airtight.Owner); + + if (!xform.Anchored || !xform.GridID.IsValid()) return; - var grid = _mapManager.GetGrid(IoCManager.Resolve().GetComponent(airtight.Owner).GridID); - airtight.LastPosition = (IoCManager.Resolve().GetComponent(airtight.Owner).GridID, grid.TileIndicesFor(IoCManager.Resolve().GetComponent(airtight.Owner).Coordinates)); + var grid = _mapManager.GetGrid(xform.GridID); + airtight.LastPosition = (xform.GridID, grid.TileIndicesFor(xform.Coordinates)); InvalidatePosition(airtight.LastPosition.Item1, airtight.LastPosition.Item2, airtight.FixVacuum && !airtight.AirBlocked); } diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Grid.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Grid.cs index db0f7cfd3b..b0eb8ac153 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Grid.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Grid.cs @@ -1315,7 +1315,7 @@ namespace Content.Server.Atmos.EntitySystems public bool AddAtmosDevice(AtmosDeviceComponent atmosDevice) { - var grid = IoCManager.Resolve().GetComponent(atmosDevice.Owner).GridID; + var grid = EntityManager.GetComponent(atmosDevice.Owner).GridID; if (!_mapManager.TryGetGrid(grid, out var mapGrid)) return false; @@ -1526,7 +1526,7 @@ namespace Content.Server.Atmos.EntitySystems public bool TryGetMapGrid(GridAtmosphereComponent gridAtmosphere, [NotNullWhen(true)] out IMapGrid? mapGrid) { - if (IoCManager.Resolve().TryGetComponent(gridAtmosphere.Owner, out IMapGridComponent? mapGridComponent)) + if (EntityManager.TryGetComponent(gridAtmosphere.Owner, out IMapGridComponent? mapGridComponent)) { mapGrid = mapGridComponent.Grid; return true; diff --git a/Content.Server/Body/Systems/LungSystem.cs b/Content.Server/Body/Systems/LungSystem.cs index 1f0ecafb4b..7c5561090e 100644 --- a/Content.Server/Body/Systems/LungSystem.cs +++ b/Content.Server/Body/Systems/LungSystem.cs @@ -114,9 +114,9 @@ public class LungSystem : EntitySystem EntityManager.TryGetComponent((mech.Body).Owner, out InternalsComponent? internals) && internals.BreathToolEntity != null && internals.GasTankEntity != null && - IoCManager.Resolve().TryGetComponent(internals.BreathToolEntity, out BreathToolComponent? breathTool) && + EntityManager.TryGetComponent(internals.BreathToolEntity, out BreathToolComponent? breathTool) && breathTool.IsFunctional && - IoCManager.Resolve().TryGetComponent(internals.GasTankEntity, out GasTankComponent? gasTank)) + EntityManager.TryGetComponent(internals.GasTankEntity, out GasTankComponent? gasTank)) { TakeGasFrom(uid, frameTime, gasTank.RemoveAirVolume(Atmospherics.BreathVolume), lung); return;