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

6
Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs
View File

@@ -45,9 +45,9 @@ namespace Content.Shared.Movement.Components
return ignoreGravityComponent.Weightless;
var transform = entityManager.GetComponent<TransformComponent>(entity);
var gridId = transform.GridEntityId;
var gridId = transform.GridUid;
if (!gridId.IsValid())
if (gridId == null)
{
// Not on a grid = no gravity for now.
// In the future, may want to allow maps to override to always have gravity instead.
@@ -55,7 +55,7 @@ namespace Content.Shared.Movement.Components
}
mapManager ??= IoCManager.Resolve<IMapManager>();
var grid = mapManager.GetGrid(gridId);
var grid = mapManager.GetGrid(gridId.Value);
var invSys = EntitySystem.Get<InventorySystem>();
if (invSys.TryGetSlotEntity(entity, "shoes", out var ent))