(779fe50ee) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs

@@ -158,18 +158,6 @@ namespace Barotrauma.Items.Components
             set { posToMaintain = value; }
         }
 
-        public Vector2? PosToMaintain
-        {
-            get { return posToMaintain; }
-            set { posToMaintain = value; }
-        }
-
-        public Vector2? PosToMaintain
-        {
-            get { return posToMaintain; }
-            set { posToMaintain = value; }
-        }
-
         struct ObstacleDebugInfo
         {
             public Vector2 Point1;
@@ -564,6 +552,7 @@ namespace Barotrauma.Items.Components
         public void ServerRead(ClientNetObject type, Lidgren.Network.NetBuffer msg, Barotrauma.Networking.Client c)
         {
             bool autoPilot              = msg.ReadBoolean();
+            bool dockingButtonClicked   = msg.ReadBoolean();
             Vector2 newSteeringInput    = targetVelocity;
             bool maintainPos            = false;
             Vector2? newPosToMaintain   = null;
@@ -590,8 +579,6 @@ namespace Barotrauma.Items.Components
 
             if (!item.CanClientAccess(c)) return;
 
-            user = c.Character;
-
             user = c.Character;
             AutoPilot = autoPilot;