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

Fix errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 21:02:04 +01:00
parent 2a3b7d809d
commit ab9d0cc6d8
94 changed files with 568 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Content.Server/Gravity/EntitySystems/WeightlessSystem.cs
View File

@@ -34,15 +34,14 @@ namespace Content.Server.Gravity.EntitySystems
public void AddAlert(ServerAlertsComponent status)
{
var gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(status.Owner).GridID;
var gridId = EntityManager.GetComponent<TransformComponent>(status.Owner).GridID;
var alerts = _alerts.GetOrNew(gridId);
alerts.Add(status);
if (_mapManager.TryGetGrid(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(status.Owner).GridID, out var grid))
if (_mapManager.TryGetGrid(EntityManager.GetComponent<TransformComponent>(status.Owner).GridID, out var grid))
{
var gridgrid.GridEntityId
if (IoCManager.Resolve<IEntityManager>().GetComponent<GravityComponent>(gridEntity).Enabled)
if (EntityManager.GetComponent<GravityComponent>(grid.GridEntityId).Enabled)
{
RemoveWeightless(status);
}
@@ -55,7 +54,7 @@ namespace Content.Server.Gravity.EntitySystems
public void RemoveAlert(ServerAlertsComponent status)
{
var grid = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(status.Owner).GridID;
var grid = EntityManager.GetComponent<TransformComponent>(status.Owner).GridID;
if (!_alerts.TryGetValue(grid, out var statuses))
{
return;
@@ -99,13 +98,13 @@ namespace Content.Server.Gravity.EntitySystems
private void EntParentChanged(ref EntParentChangedMessage ev)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(ev.Entity, out ServerAlertsComponent? status))
if (!EntityManager.TryGetComponent(ev.Entity, out ServerAlertsComponent? status))
{
return;
}
if (ev.OldParent != null &&
IoCManager.Resolve<IEntityManager>().TryGetComponent(ev.OldParent, out IMapGridComponent? mapGrid))
if (ev.OldParent is {Valid: true} old &&
EntityManager.TryGetComponent(old, out IMapGridComponent? mapGrid))
{
var oldGrid = mapGrid.GridIndex;
@@ -115,7 +114,7 @@ namespace Content.Server.Gravity.EntitySystems
}
}
var newGrid = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(ev.Entity).GridID;
var newGrid = EntityManager.GetComponent<TransformComponent>(ev.Entity).GridID;
var newStatuses = _alerts.GetOrNew(newGrid);
newStatuses.Add(status);