Nullable grid Uid (#8798)

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

View File

@@ -66,7 +66,7 @@ namespace Content.Server.Physics.Controllers
if (pilot.Console == null) continue;
_excludedMobs.Add(mover.Owner);
var gridId = xform.GridEntityId;
var gridId = xform.GridUid;
// This tries to see if the grid is a shuttle
if (!_mapManager.TryGetGrid(gridId, out var grid) ||
!EntityManager.TryGetComponent(grid.GridEntityId, out ShuttleComponent? shuttleComponent)) continue;