From 86ce1258d7e7d80e0e1772f9387163d3fb0e2d4b Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Thu, 23 Mar 2023 17:50:51 +1100 Subject: [PATCH] Fix docking (#14789) --- 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 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(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(dockBUid, out var airlockB)) -- 2.51.2