(fdc49c8c) Unstable 0.9.7.1

Barotrauma/BarotraumaServer/ServerSource/Characters/CharacterNetworking.cs

@@ -438,7 +438,7 @@ namespace Barotrauma
             }
         }
 
-        public void WriteSpawnData(IWriteMessage msg, UInt16 entityId)
+        public void WriteSpawnData(IWriteMessage msg, UInt16 entityId, bool restrictMessageSize)
         {
             if (GameMain.Server == null) return;
             
@@ -465,7 +465,7 @@ namespace Barotrauma
             //character with no characterinfo (e.g. some monster)
             if (Info == null)
             {
-                WriteStatus(msg);
+                TryWriteStatus(msg);
                 return;
             }
 
@@ -489,7 +489,23 @@ namespace Barotrauma
             msg.Write(this is AICharacter);
             msg.Write(info.SpeciesName);
             info.ServerWrite(msg);
-            WriteStatus(msg);
+            TryWriteStatus(msg);
+
+            void TryWriteStatus(IWriteMessage msg)
+            {
+                var tempBuffer = new ReadWriteMessage();
+                WriteStatus(tempBuffer);
+                if (msg.LengthBytes + tempBuffer.LengthBytes >= 255 && restrictMessageSize)
+                { 
+                    msg.Write(false);
+                    DebugConsole.ThrowError($"Error when writing character spawn data: status data caused the length of the message to exceed 255 bytes ({msg.LengthBytes} + {tempBuffer.LengthBytes})");
+                }
+                else
+                {
+                    msg.Write(true);
+                    WriteStatus(msg);
+                }
+            }
 
             DebugConsole.Log("Character spawn message length: " + (msg.LengthBytes - msgLength));
         }

Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs

@@ -1970,7 +1970,7 @@ namespace Barotrauma
                 return;
             }
 
-            string[] splitCommand = SplitCommand(command);
+            string[] splitCommand = ToolBox.SplitCommand(command);
             Command matchingCommand = commands.Find(c => c.names.Contains(splitCommand[0].ToLowerInvariant()));
             if (matchingCommand != null && !client.PermittedConsoleCommands.Contains(matchingCommand) && client.Connection != GameMain.Server.OwnerConnection)
             {

Barotrauma/BarotraumaServer/ServerSource/Events/Missions/MonsterMission.cs

@@ -15,7 +15,7 @@ namespace Barotrauma
             msg.Write((byte)monsters.Count);
             foreach (Character monster in monsters)
             {
-                monster.WriteSpawnData(msg, monster.ID);
+                monster.WriteSpawnData(msg, monster.ID, restrictMessageSize: false);
             }
         }
     }

Barotrauma/BarotraumaServer/ServerSource/Networking/EntitySpawner.cs

@@ -41,7 +41,7 @@ namespace Barotrauma
                 {
                     message.Write((byte)SpawnableType.Character);
                     DebugConsole.Log("Writing character spawn data: " + entities.Entity.ToString() + " (original ID: " + entities.OriginalID + ", current ID: " + entities.Entity.ID + ")");
-                    ((Character)entities.Entity).WriteSpawnData(message, entities.OriginalID);
+                    ((Character)entities.Entity).WriteSpawnData(message, entities.OriginalID, restrictMessageSize: true);
                 }
             }
         }

Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs

@@ -2587,8 +2587,8 @@ namespace Barotrauma.Networking
 
         public void SendOrderChatMessage(OrderChatMessage message)
         {
-            if (message.Sender == null || message.Sender.SpeechImpediment >= 100.0f) return;
-            ChatMessageType messageType = ChatMessage.CanUseRadio(message.Sender) ? ChatMessageType.Radio : ChatMessageType.Default;
+            if (message.Sender == null || message.Sender.SpeechImpediment >= 100.0f) { return; }
+            //ChatMessageType messageType = ChatMessage.CanUseRadio(message.Sender) ? ChatMessageType.Radio : ChatMessageType.Default;
 
             //check which clients can receive the message and apply distance effects
             foreach (Client client in ConnectedClients)
@@ -2598,13 +2598,8 @@ namespace Barotrauma.Networking
                 if (message.Sender != null &&
                     client.Character != null && !client.Character.IsDead)
                 {
-                    if (message.Sender != client.Character)
-                    {
-                        modifiedMessage = ChatMessage.ApplyDistanceEffect(message.Text, messageType, message.Sender, client.Character);
-                    }
-
                     //too far to hear the msg -> don't send
-                    if (string.IsNullOrWhiteSpace(modifiedMessage)) continue;
+                    if (!client.Character.CanHearCharacter(message.Sender)) { continue; }
                 }
 
                 SendDirectChatMessage(new OrderChatMessage(message.Order, message.OrderOption, message.TargetEntity, message.TargetCharacter, message.Sender), client);

Barotrauma/BarotraumaServer/ServerSource/Program.cs

@@ -97,7 +97,7 @@ namespace Barotrauma
             sb.AppendLine("System info:");
             sb.AppendLine("    Operating system: " + System.Environment.OSVersion + (System.Environment.Is64BitOperatingSystem ? " 64 bit" : " x86"));
             sb.AppendLine("\n");
-            sb.AppendLine("Exception: "+exception.Message);
+            sb.AppendLine("Exception: " + exception.Message + " (" + exception.GetType().ToString() + ")");
             sb.AppendLine("Target site: " +exception.TargetSite.ToString());
             sb.AppendLine("Stack trace: ");
             sb.AppendLine(exception.StackTrace);