From 295e2620ad063b00924a828362bce2ad7deb0755 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Sun, 14 May 2023 13:29:50 +1000
Subject: [PATCH] Fix docking re-anchor crash (#16404)

---
 Content.Server/Shuttles/Systems/DockingSystem.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Shuttles/Systems/DockingSystem.cs b/Content.Server/Shuttles/Systems/DockingSystem.cs
index b5b4798364..26dfd68b60 100644
--- a/Content.Server/Shuttles/Systems/DockingSystem.cs
+++ b/Content.Server/Shuttles/Systems/DockingSystem.cs
@@ -236,10 +236,11 @@ namespace Content.Server.Shuttles.Systems
             if (!component.Docked)
                 return;
 
-            var other = Comp<DockingComponent>(component.DockedWith!.Value);
+            var otherDock = component.DockedWith;
+            var other = Comp<DockingComponent>(otherDock!.Value);
 
             Undock(uid, component);
-            Dock(uid, component, component.DockedWith.Value, other);
+            Dock(uid, component, otherDock.Value, other);
             _console.RefreshShuttleConsoles();
         }
 
-- 
2.51.2