Build 0.18.7.0

Barotrauma/BarotraumaServer/ServerSource/Networking/Client.cs

@@ -73,6 +73,9 @@ namespace Barotrauma.Networking
                 characterInfo = value;
             }
         }
+
+        public string PendingName;
+
         public NetworkConnection Connection { get; set; }
 
         public bool SpectateOnly;

Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs

@@ -1046,7 +1046,7 @@ namespace Barotrauma.Networking
                         c.LastRecvChatMsgID = NetIdUtils.Clamp(inc.ReadUInt16(), c.LastRecvChatMsgID, c.LastChatMsgQueueID);
                         c.LastRecvClientListUpdate = NetIdUtils.Clamp(inc.ReadUInt16(), c.LastRecvClientListUpdate, LastClientListUpdateID);
 
-                        TryChangeClientName(c, inc);
+                        ReadClientNameChange(c, inc);
 
                         c.LastRecvCampaignSave = inc.ReadUInt16();
                         if (c.LastRecvCampaignSave > 0)
@@ -2675,7 +2675,7 @@ namespace Barotrauma.Networking
             base.AddChatMessage(message);
         }
 
-        private bool TryChangeClientName(Client c, IReadMessage inc)
+        private bool ReadClientNameChange(Client c, IReadMessage inc)
         {
             UInt16 nameId = inc.ReadUInt16();
             string newName = inc.ReadString();
@@ -2685,16 +2685,21 @@ namespace Barotrauma.Networking
             if (c == null || string.IsNullOrEmpty(newName) || !NetIdUtils.IdMoreRecent(nameId, c.NameID)) { return false; }
 
             c.NameID = nameId;
-            newName = Client.SanitizeName(newName);
             if (newName == c.Name && newJob == c.PreferredJob && newTeam == c.PreferredTeam) { return false; }
             c.PreferredJob = newJob;
             c.PreferredTeam = newTeam;
 
+            return TryChangeClientName(c, newName);
+        }
+
+        public bool TryChangeClientName(Client c, string newName)
+        {
+            newName = Client.SanitizeName(newName);
             //update client list even if the name cannot be changed to the one sent by the client,
             //so the client will be informed what their actual name is
             LastClientListUpdateID++;
 
-            if (newName == c.Name) { return false; }
+            if (newName == c.Name || string.IsNullOrEmpty(newName)) { return false; }
 
             if (IsNameValid(c, newName))
             {
@@ -2710,6 +2715,7 @@ namespace Barotrauma.Networking
             }
         }
 
+
         private bool IsNameValid(Client c, string newName)
         {
             newName = Client.SanitizeName(newName);
@@ -3542,6 +3548,10 @@ namespace Barotrauma.Networking
                 {
                     newName = sender.Name;
                 }
+                else
+                {
+                    sender.PendingName = newName;
+                }
             }
 
             int tagCount = message.ReadByte();

Barotrauma/BarotraumaServer/ServerSource/Networking/RespawnManager.cs

@@ -392,6 +392,14 @@ namespace Barotrauma.Networking
                 bool forceSpawnInMainSub = false;
                 if (!bot && campaign != null)
                 {
+                    //the client has opted to change the name of their new character
+                    //when the character spawns, set the client's name to match
+                    if (clients[i].PendingName == characterInfos[i].Name)
+                    {
+                        GameMain.Server?.TryChangeClientName(clients[i], clients[i].PendingName);
+                        clients[i].PendingName = null;
+                    }
+
                     var matchingData = campaign?.GetClientCharacterData(clients[i]);
                     if (matchingData != null)
                     {