Build 0.18.7.0

Barotrauma/BarotraumaClient/ClientSource/Networking/GameClient.cs

@@ -1200,7 +1200,14 @@ namespace Barotrauma.Networking
                     new LocalizedString[] { TextManager.Get("Cancel") });
                 reconnectBox.Buttons[0].OnClicked += (btn, userdata) => { CancelConnect(); return true; };
                 connected = false;
+
+                var prevContentPackages = clientPeer.ServerContentPackages;
                 ConnectToServer(serverEndpoint, serverName);
+                if (clientPeer != null)
+                {
+                    //restore the previous list of content packages so we can reconnect immediately without having to recheck that the packages match
+                    clientPeer.ServerContentPackages = prevContentPackages;
+                }
             }
             else
             {

Barotrauma/BarotraumaClient/ClientSource/Networking/OrderChatMessage.cs

@@ -9,6 +9,7 @@ namespace Barotrauma.Networking
             msg.Write((byte)ClientNetObject.CHAT_MESSAGE);
             msg.Write(NetStateID);
             msg.WriteRangedInteger((int)ChatMessageType.Order, 0, Enum.GetValues(typeof(ChatMessageType)).Length - 1);
+            msg.WriteRangedInteger((int)ChatMode.None, 0, Enum.GetValues(typeof(ChatMode)).Length - 1);
             WriteOrder(msg);
         }
     }

Barotrauma/BarotraumaClient/ClientSource/Networking/Primitives/Peers/ClientPeer.cs

@@ -50,7 +50,7 @@ namespace Barotrauma.Networking
             }
         }
 
-        public ImmutableArray<ServerContentPackage> ServerContentPackages { get; private set; } =
+        public ImmutableArray<ServerContentPackage> ServerContentPackages { get; set; } =
             ImmutableArray<ServerContentPackage>.Empty;
 
         public delegate void MessageCallback(IReadMessage message);

Barotrauma/BarotraumaClient/ClientSource/Networking/Primitives/Peers/LidgrenClientPeer.cs

@@ -117,8 +117,6 @@ namespace Barotrauma.Networking
 
             PacketHeader packetHeader = (PacketHeader)inc.ReadByte();
 
-            //Console.WriteLine(isCompressed + " " + isConnectionInitializationStep + " " + (int)incByte);
-
             if (packetHeader.IsConnectionInitializationStep() && initializationStep != ConnectionInitialization.Success)
             {
                 ReadConnectionInitializationStep(new ReadWriteMessage(inc.Data, (int)inc.Position, inc.LengthBits, false));