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.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
@@ -142,7 +142,7 @@ namespace Content.Server.Shuttles.Systems
                pilot.Console is not ShuttleConsoleComponent console) return;

            if (!console.SubscribedPilots.Contains(pilot) ||
-                !TryComp<ShuttleComponent>(xform.GridEntityId, out var shuttle)) return;
+                !TryComp<ShuttleComponent>(xform.GridUid, out var shuttle)) return;

            SetShuttleMode(args.Mode, console, shuttle);
        }