Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup WeightlessSystem (#8193)

Browse Source
This commit is contained in:
Leon Friedrich
2022-05-18 14:44:15 +12:00
committed by GitHub
parent 290b2639c3
commit 277d59b8ec
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
using Content.Shared.Alert; using Content.Shared.Alert;
using Content.Shared.GameTicking; using Content.Shared.GameTicking;
using Content.Shared.Gravity; using Content.Shared.Gravity;
using Content.Shared.Movement.Components;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Utility; using Robust.Shared.Utility;
@@ -21,7 +22,7 @@ namespace Content.Server.Gravity.EntitySystems
SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset); SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
SubscribeLocalEvent<GravityChangedMessage>(GravityChanged); SubscribeLocalEvent<GravityChangedMessage>(GravityChanged);
SubscribeLocalEvent<EntParentChangedMessage>(EntParentChanged); SubscribeLocalEvent<AlertsComponent, EntParentChangedMessage>(EntParentChanged);
SubscribeLocalEvent<AlertsComponent, AlertSyncEvent>(HandleAlertSyncEvent); SubscribeLocalEvent<AlertsComponent, AlertSyncEvent>(HandleAlertSyncEvent);
} }
@@ -32,12 +33,12 @@ namespace Content.Server.Gravity.EntitySystems
public void AddAlert(AlertsComponent status) public void AddAlert(AlertsComponent status)
{ {
var gridId = EntityManager.GetComponent<TransformComponent>(status.Owner).GridID; var xform = Transform(status.Owner);
var alerts = _alerts.GetOrNew(gridId); var alerts = _alerts.GetOrNew(xform.GridID);
alerts.Add(status); alerts.Add(status);
if (_mapManager.TryGetGrid(EntityManager.GetComponent<TransformComponent>(status.Owner).GridID, out var grid)) if (_mapManager.TryGetGrid(xform.GridID, out var grid))
{ {
if (EntityManager.GetComponent<GravityComponent>(grid.GridEntityId).Enabled) if (EntityManager.GetComponent<GravityComponent>(grid.GridEntityId).Enabled)
{ {
@@ -94,13 +95,9 @@ namespace Content.Server.Gravity.EntitySystems
_alertsSystem.ClearAlert(euid, AlertType.Weightless); _alertsSystem.ClearAlert(euid, AlertType.Weightless);
} }
private void EntParentChanged(ref EntParentChangedMessage ev) private void EntParentChanged(EntityUid uid, AlertsComponent status, ref EntParentChangedMessage ev)
{ {
if (!EntityManager.TryGetComponent(ev.Entity, out AlertsComponent? status)) // First, update the `_alerts` dictionary
{
return;
}
if (ev.OldParent is {Valid: true} old && if (ev.OldParent is {Valid: true} old &&
EntityManager.TryGetComponent(old, out IMapGridComponent? mapGrid)) EntityManager.TryGetComponent(old, out IMapGridComponent? mapGrid))
{ {
@@ -112,10 +109,21 @@ namespace Content.Server.Gravity.EntitySystems
} }
} }
var newGrid = EntityManager.GetComponent<TransformComponent>(ev.Entity).GridID; var newGrid = ev.Transform.GridID;
var newStatuses = _alerts.GetOrNew(newGrid); var newStatuses = _alerts.GetOrNew(newGrid);
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,
// or if they ignore gravity-based movement altogether.
// TODO: update this when planets and the like are added.
// TODO: update alert when the ignore-gravity component is added or removed.
if (_mapManager.TryGetGrid(newGrid, out var grid)
&& TryComp(grid.GridEntityId, out GravityComponent? gravity)
&& gravity.Enabled)
RemoveWeightless(status.Owner);
else if (!HasComp<MovementIgnoreGravityComponent>(uid))
AddWeightless(status.Owner);
} }
private void HandleAlertSyncEvent(EntityUid uid, AlertsComponent component, AlertSyncEvent args) private void HandleAlertSyncEvent(EntityUid uid, AlertsComponent component, AlertSyncEvent args)