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

Nullable grid Uid (#8798)

Browse Source
This commit is contained in:
Leon Friedrich
2022-06-20 12:14:35 +12:00
committed by GitHub
parent ef41cd5aa8
commit fa4c6f63f8
82 changed files with 318 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Gravity/EntitySystems/GravityGeneratorSystem.cs
View File

@@ -187,12 +187,11 @@ namespace Content.Server.Gravity.EntitySystems
private void UpdateGravityActive(GravityGeneratorComponent grav, bool shake)
{
var gridId = EntityManager.GetComponent<TransformComponent>(grav.Owner).GridEntityId;
if (gridId == EntityUid.Invalid)
var gridId = EntityManager.GetComponent<TransformComponent>(grav.Owner).GridUid;
if (!_mapManager.TryGetGrid(gridId, out var grid))
return;
var grid = _mapManager.GetGrid(gridId);
var gravity = EntityManager.GetComponent<GravityComponent>(grid.GridEntityId);
var gravity = EntityManager.GetComponent<GravityComponent>(gridId.Value);
if (grav.GravityActive)
_gravitySystem.EnableGravity(gravity);
@@ -200,7 +199,7 @@ namespace Content.Server.Gravity.EntitySystems
_gravitySystem.DisableGravity(gravity);
if (shake)
_gravityShakeSystem.ShakeGrid(gridId, gravity);
_gravityShakeSystem.ShakeGrid(gridId.Value, gravity);
}
private void OnInteractHand(EntityUid uid, GravityGeneratorComponent component, InteractHandEvent args)