From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Thu, 23 Mar 2023 06:50:51 +0000 (+1100)
Subject: Fix docking (#14789)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=86ce1258d7e7d80e0e1772f9387163d3fb0e2d4b;p=space-station-14.git

Fix docking (#14789)
---

diff --git a/Content.Server/Shuttles/Systems/DockingSystem.cs b/Content.Server/Shuttles/Systems/DockingSystem.cs
index 24471d9bc6..38f8e4f0a4 100644
--- a/Content.Server/Shuttles/Systems/DockingSystem.cs
+++ b/Content.Server/Shuttles/Systems/DockingSystem.cs
@@ -284,6 +284,7 @@ namespace Content.Server.Shuttles.Systems
             if (dockBUid.GetHashCode() < dockAUid.GetHashCode())
             {
                 (dockA, dockB) = (dockB, dockA);
+                (dockAUid, dockBUid) = (dockBUid, dockAUid);
             }
 
             _sawmill.Debug($"Docking between {dockAUid} and {dockBUid}");
@@ -351,7 +352,7 @@ namespace Content.Server.Shuttles.Systems
 
             if (TryComp(dockAUid, out DoorComponent? doorA))
             {
-                if (_doorSystem.TryOpen(doorA.Owner, doorA))
+                if (_doorSystem.TryOpen(dockAUid, doorA))
                 {
                     doorA.ChangeAirtight = false;
                     if (TryComp<AirlockComponent>(dockAUid, out var airlockA))
@@ -363,7 +364,7 @@ namespace Content.Server.Shuttles.Systems
 
             if (TryComp(dockBUid, out DoorComponent? doorB))
             {
-                if (_doorSystem.TryOpen(doorB.Owner, doorB))
+                if (_doorSystem.TryOpen(dockBUid, doorB))
                 {
                     doorB.ChangeAirtight = false;
                     if (TryComp<AirlockComponent>(dockBUid, out var airlockB))