v0.11.0.9

Barotrauma/BarotraumaClient/ClientSource/Networking/GameClient.cs

@@ -272,6 +272,7 @@ namespace Barotrauma.Networking
         private void ConnectToServer(object endpoint, string hostName)
         {
             LastClientListUpdateID = 0;
+
             foreach (var c in ConnectedClients)
             {
                 GameMain.NetLobbyScreen.RemovePlayer(c);
@@ -361,6 +362,14 @@ namespace Barotrauma.Networking
                 {
                     GameMain.NetLobbyScreen.Select();
                 }
+                else
+                {
+                    entityEventManager.ClearSelf();
+                    foreach (Character c in Character.CharacterList)
+                    {
+                        c.ResetNetState();
+                    }
+                }
 
                 chatBox.InputBox.Enabled = true;
                 if (GameMain.NetLobbyScreen?.ChatInput != null)
@@ -903,6 +912,9 @@ namespace Barotrauma.Networking
                 case ServerPacketHeader.CREW:
                     campaign?.ClientReadCrew(inc);
                     break;
+                case ServerPacketHeader.READY_CHECK:
+                    ReadyCheck.ClientRead(inc);
+                    break;
                 case ServerPacketHeader.FILE_TRANSFER:
                     fileReceiver.ReadMessage(inc);
                     break;
@@ -976,7 +988,7 @@ namespace Barotrauma.Networking
                         string errorMsg = "Level equality check failed. The level generated at your end doesn't match the level generated by the server" +
                             " (client value #" + i + ": " + Level.Loaded.EqualityCheckValues[i] +
                             ", server value #" + i + ": " + levelEqualityCheckValues[i].ToString("X") +
-                            ", level value count: " + levelEqualityCheckValues.Count.ToString("X") +
+                            ", level value count: " + levelEqualityCheckValues.Count +
                             ", seed: " + Level.Loaded.Seed +
                             ", sub: " + Submarine.MainSub.Info.Name + " (" + Submarine.MainSub.Info.MD5Hash.ShortHash + ")" +
                             ", mirrored: " + Level.Loaded.Mirrored + ").";
@@ -2892,8 +2904,9 @@ namespace Barotrauma.Networking
                 return false;
             }
             if (button != null) { button.Enabled = false; }
-            if (campaign != null) LateCampaignJoin = true;
+            if (campaign != null) { LateCampaignJoin = true; }
 
+            if (clientPeer == null) { return false; }
 
             IWriteMessage readyToStartMsg = new WriteOnlyMessage();
             readyToStartMsg.Write((byte)ClientPacketHeader.RESPONSE_STARTGAME);