Unstable v0.1300.0.0 (February 19th 2021)

2021-02-25 13:44:23 +02:00
parent b772654326
commit 24cbef485a
441 changed files with 21343 additions and 8562 deletions
@@ -165,7 +165,14 @@ namespace Barotrauma.Items.Components

                if (isLocked)
                {
-                    Lock(isNetworkMessage: true, forcePosition: true);
+                    if (DockingTarget.joint != null)
+                    {
+                        DockingTarget.Lock(isNetworkMessage: true, forcePosition: true);
+                    }
+                    else
+                    {
+                        Lock(isNetworkMessage: true, forcePosition: true);
+                    }
                }
            }
            else