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

Fix weightless system error (#8965)

Browse Source
This commit is contained in:
Leon Friedrich
2022-06-20 13:26:21 +12:00
committed by GitHub
parent dd68f15b55
commit cba8ff270c
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,8 +53,8 @@ namespace Content.Server.Gravity.EntitySystems
public void RemoveAlert(AlertsComponent status) public void RemoveAlert(AlertsComponent status)
{ {
var grid = EntityManager.GetComponent<TransformComponent>(status.Owner).GridID; var grid = EntityManager.GetComponent<TransformComponent>(status.Owner).GridUid;
if (!_alerts.TryGetValue(grid, out var statuses)) if (grid == null || !_alerts.TryGetValue(grid.Value, out var statuses))
{ {
return; return;
} }
@@ -112,10 +112,13 @@ namespace Content.Server.Gravity.EntitySystems
if (ev.Transform.MapID == MapId.Nullspace) if (ev.Transform.MapID == MapId.Nullspace)
return; return;
var newGrid = ev.Transform.GridID;
var newStatuses = _alerts.GetOrNew(newGrid);
var newGrid = ev.Transform.GridUid;
if (newGrid != null)
{
var newStatuses = _alerts.GetOrNew(newGrid.Value);
newStatuses.Add(status); newStatuses.Add(status);
}
// then update the actual alert. The alert is only removed if either the player is on a grid with gravity, // then update the actual alert. The alert is only removed if either the player is on a grid with gravity,
// or if they ignore gravity-based movement altogether. // or if they ignore gravity-based movement altogether.