Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

2
Content.Shared/SubFloor/SharedSubFloorHideSystem.cs
View File

@@ -98,7 +98,7 @@ namespace Content.Shared.SubFloor
if (!Resolve(uid, ref component, ref xform))
return;
if (xform.Anchored && MapManager.TryGetGrid(xform.GridEntityId, out var grid))
if (xform.Anchored && MapManager.TryGetGrid(xform.GridUid, out var grid))
component.IsUnderCover = HasFloorCover(grid, grid.TileIndicesFor(xform.Coordinates));
else
component.IsUnderCover = false;

2
Content.Shared/SubFloor/TrayScannerSystem.cs
View File

@@ -208,7 +208,7 @@ public sealed class TrayScannerSystem : EntitySystem
// For now, limiting to the scanner's own grid. We could do a grid-lookup, but then what do we do if one grid
// flies away, while the scanner's local-position remains unchanged?
if (_mapManager.TryGetGrid(transform.GridEntityId, out var grid))
if (_mapManager.TryGetGrid(transform.GridUid, out var grid))
{
foreach (var entity in grid.GetAnchoredEntities(worldBox))
{