Nullable grid Uid (#8798)

2022-06-20 12:14:35 +12:00
parent ef41cd5aa8
commit fa4c6f63f8
82 changed files with 318 additions and 242 deletions
--- a/Content.Shared/SubFloor/TrayScannerSystem.cs
+++ b/Content.Shared/SubFloor/TrayScannerSystem.cs
@@ -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))
            {