Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix docking (#14789)

Browse Source
This commit is contained in:
metalgearsloth
2023-03-23 17:50:51 +11:00
committed by GitHub
parent 6ef66a7ada
commit 86ce1258d7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Shuttles/Systems/DockingSystem.cs
View File

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