Build 0.18.0.0

Barotrauma/BarotraumaServer/ServerSource/Items/Components/DockingPort.cs

@@ -1,19 +1,27 @@
 using Barotrauma.Networking;
-using System;
 
 namespace Barotrauma.Items.Components
 {
-    partial class DockingPort : ItemComponent, IDrawableComponent, IServerSerializable
+    partial class DockingPort : ItemComponent, IDrawableComponent, IServerSerializable, IClientSerializable
     {
         public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
             msg.Write(docked);
-
             if (docked)
             {
                 msg.Write(DockingTarget.item.ID);
                 msg.Write(IsLocked);
             }
         }
+        public void ServerEventRead(IReadMessage msg, Client c)
+        {
+            var allowOutpostAutoDocking = (AllowOutpostAutoDocking)msg.ReadByte();
+            if (outpostAutoDockingPromptShown &&
+                (GameMain.GameSession?.Campaign?.AllowedToManageCampaign(c, ClientPermissions.ManageMap) ?? false))
+            {
+                this.allowOutpostAutoDocking = allowOutpostAutoDocking;
+            }
+        }
+
     }
 }

Barotrauma/BarotraumaServer/ServerSource/Items/Components/ItemLabel.cs

@@ -39,7 +39,7 @@ namespace Barotrauma.Items.Components
             set;
         }
 
-        public override void Move(Vector2 amount)
+        public override void Move(Vector2 amount, bool ignoreContacts = false)
         {
             //do nothing
         }

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Signal/ConnectionPanel.cs

@@ -15,7 +15,8 @@ namespace Barotrauma.Items.Components
             for (int i = 0; i < Connections.Count; i++)
             {
                 wires[i] = new List<Wire>();
-                for (int j = 0; j < Connections[i].MaxWires; j++)
+                uint wireCount = msg.ReadVariableUInt32();
+                for (int j = 0; j < wireCount; j++)
                 {
                     ushort wireId = msg.ReadUInt16();
 
@@ -91,12 +92,8 @@ namespace Barotrauma.Items.Components
             //go through existing wire links
             for (int i = 0; i < Connections.Count; i++)
             {
-                int j = -1;
-                foreach (Wire existingWire in Connections[i].Wires)
+                foreach (Wire existingWire in Connections[i].Wires.ToArray())
                 {
-                    j++;
-                    if (existingWire == null) { continue; }
-
                     //existing wire not in the list of new wires -> disconnect it
                     if (!wires[i].Contains(existingWire))
                     {
@@ -163,7 +160,7 @@ namespace Barotrauma.Items.Components
                             }*/
                         }
 
-                        Connections[i].SetWire(j, null);
+                        Connections[i].DisconnectWire(existingWire);
                     }
                 }
             }