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

Remove Explicit GridId References (#8315)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Acruid
2022-06-11 18:54:41 -07:00
committed by GitHub
parent 846321cebb
commit 4f9be42f40
131 changed files with 531 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@ namespace Content.Server.Gravity.EntitySystems
[Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly AlertsSystem _alertsSystem = default!;
private readonly Dictionary<GridId, List<AlertsComponent>> _alerts = new();
private readonly Dictionary<EntityUid, List<AlertsComponent>> _alerts = new();
public override void Initialize()
{
@@ -34,11 +34,11 @@ namespace Content.Server.Gravity.EntitySystems
public void AddAlert(AlertsComponent status)
{
var xform = Transform(status.Owner);
var alerts = _alerts.GetOrNew(xform.GridID);
var alerts = _alerts.GetOrNew(xform.GridEntityId);
alerts.Add(status);
if (_mapManager.TryGetGrid(xform.GridID, out var grid))
if (_mapManager.TryGetGrid(xform.GridEntityId, out var grid))
{
if (EntityManager.GetComponent<GravityComponent>(grid.GridEntityId).Enabled)
{
@@ -53,7 +53,7 @@ namespace Content.Server.Gravity.EntitySystems
public void RemoveAlert(AlertsComponent status)
{
var grid = EntityManager.GetComponent<TransformComponent>(status.Owner).GridID;
var grid = EntityManager.GetComponent<TransformComponent>(status.Owner).GridEntityId;
if (!_alerts.TryGetValue(grid, out var statuses))
{
return;
@@ -101,7 +101,7 @@ namespace Content.Server.Gravity.EntitySystems
if (ev.OldParent is {Valid: true} old &&
EntityManager.TryGetComponent(old, out IMapGridComponent? mapGrid))
{
var oldGrid = mapGrid.GridIndex;
var oldGrid = mapGrid.Owner;
if (_alerts.TryGetValue(oldGrid, out var oldStatuses))
{
@@ -109,7 +109,7 @@ namespace Content.Server.Gravity.EntitySystems
}
}
var newGrid = ev.Transform.GridID;
var newGrid = ev.Transform.GridEntityId;
var newStatuses = _alerts.GetOrNew(newGrid);
newStatuses.Add(status);