Unstable 0.1300.0.4

Barotrauma/BarotraumaClient/ClientSource/Networking/ChatMessage.cs

@@ -29,6 +29,14 @@ namespace Barotrauma.Networking
 
             string senderName = msg.ReadString();
             Character senderCharacter = null;
+            Client senderClient = null;
+            bool hasSenderClient = msg.ReadBoolean();
+            if (hasSenderClient)
+            {
+                UInt64 clientId = msg.ReadUInt64();
+                senderClient = GameMain.Client.ConnectedClients.Find(c => c.SteamID == clientId || c.ID == clientId);
+                if (senderClient != null) { senderName = senderClient.Name; }
+            }
             bool hasSenderCharacter = msg.ReadBoolean();
             if (hasSenderCharacter)
             {
@@ -38,6 +46,7 @@ namespace Barotrauma.Networking
                     senderName = senderCharacter.Name;
                 }
             }
+            msg.ReadPadBits();
 
             switch (type)
             {
@@ -197,7 +206,7 @@ namespace Barotrauma.Networking
                         GameMain.Client.ServerSettings.ServerLog?.WriteLine(txt, messageType);
                         break;
                     default:
-                        GameMain.Client.AddChatMessage(txt, type, senderName, senderCharacter, changeType);
+                        GameMain.Client.AddChatMessage(txt, type, senderName, senderClient, senderCharacter, changeType);
                         break;
                 }
                 LastID = id;

Barotrauma/BarotraumaClient/ClientSource/Networking/GameClient.cs

@@ -1805,8 +1805,10 @@ namespace Barotrauma.Networking
                 var matchingSub = SubmarineInfo.SavedSubmarines.FirstOrDefault(s => s.Name == subName && s.MD5Hash.Hash == subHash);
                 if (matchingSub == null)
                 {
-                    matchingSub = new SubmarineInfo(Path.Combine(SubmarineInfo.SavePath, subName) + ".sub", subHash, tryLoad: false);
-                    matchingSub.SubmarineClass = (SubmarineClass)subClass;
+                    matchingSub = new SubmarineInfo(Path.Combine(SubmarineInfo.SavePath, subName) + ".sub", subHash, tryLoad: false)
+                    {
+                        SubmarineClass = (SubmarineClass)subClass
+                    };
                 }
                 matchingSub.RequiredContentPackagesInstalled = requiredContentPackagesInstalled;
                 ServerSubmarines.Add(matchingSub);
@@ -3578,6 +3580,10 @@ namespace Barotrauma.Networking
             {
                 errorLines.Add("Submarine: " + GameMain.GameSession.Submarine.Info.Name);
             }
+            if (GameMain.NetworkMember?.RespawnManager?.RespawnShuttle != null)
+            {
+                errorLines.Add("Respawn shuttle: " + GameMain.NetworkMember.RespawnManager.RespawnShuttle.Info.Name);
+            }
             if (Level.Loaded != null)
             {
                 errorLines.Add("Level: " + Level.Loaded.Seed + ", " + string.Join(", ", Level.Loaded.EqualityCheckValues.Select(cv => cv.ToString("X"))));

Barotrauma/BarotraumaClient/ClientSource/Networking/ServerSettings.cs

@@ -648,7 +648,14 @@ namespace Barotrauma.Networking
 
             foreach (ItemPrefab ip in ItemPrefab.Prefabs)
             {
-                if (!ip.CanBeBought && !ip.Tags.Contains("smallitem")) continue;
+                if (ip.AllowAsExtraCargo.HasValue)
+                {
+                    if (!ip.AllowAsExtraCargo.Value) { continue; }
+                }
+                else
+                {
+                    if (!ip.CanBeBought) { continue; }
+                }
 
                 var itemFrame = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.15f), cargoFrame.Content.RectTransform) { MinSize = new Point(0, 30) }, isHorizontal: true)
                 {

Barotrauma/BarotraumaClient/ClientSource/Networking/Voting.cs

@@ -112,14 +112,17 @@ namespace Barotrauma
 
             switch (voteType)
             {
-                case VoteType.Sub:                    
-                    SubmarineInfo sub = data as SubmarineInfo;
-                    if (sub == null) { return; }
+                case VoteType.Sub:
+                    if (!(data is SubmarineInfo sub)) { return; }
                     msg.Write(sub.EqualityCheckVal);
+                    if (sub.EqualityCheckVal == 0)
+                    {
+                        //sub doesn't exist client-side, use hash to let the server know which one we voted for
+                        msg.Write(sub.MD5Hash.Hash);
+                    }
                     break;
                 case VoteType.Mode:
-                    GameModePreset gameMode = data as GameModePreset;
-                    if (gameMode == null) { return; }
+                    if (!(data is GameModePreset gameMode)) { return; }
                     msg.Write(gameMode.Identifier);
                     break;
                 case VoteType.EndRound:
@@ -127,8 +130,7 @@ namespace Barotrauma
                     msg.Write((bool)data);
                     break;
                 case VoteType.Kick:
-                    Client votedClient = data as Client;
-                    if (votedClient == null) return;
+                    if (!(data is Client votedClient)) { return; }
 
                     msg.Write(votedClient.ID);
                     break;