OBT/1.2.1(Summer update)

Sync with upstream

Barotrauma/BarotraumaServer/ServerSource/Networking/ChatMessage.cs

@@ -8,6 +8,17 @@ namespace Barotrauma.Networking
 {
     partial class ChatMessage
     {
+        private static string SanitizeText(Client client, string text)
+        {
+            if (!client.HasPermission(ClientPermissions.SpamImmunity))
+            {
+                // Prevent clients without spam immunity from being able to use RichString features
+                text = text.Replace('‖', ' ');
+            }
+
+            return text;
+        }
+
         public static void ServerRead(IReadMessage msg, Client c)
         {
             c.KickAFKTimer = 0.0f;
@@ -69,8 +80,7 @@ namespace Barotrauma.Networking
                 txt = msg.ReadString() ?? "";
             }
 
-            // Sanitize incoming text message from client so they can't use RichString features
-            txt = txt.Replace('‖', ' ');
+            txt = SanitizeText(c, txt);
 
             if (!NetIdUtils.IdMoreRecent(ID, c.LastSentChatMsgID)) { return; }
 

Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs

@@ -904,7 +904,10 @@ namespace Barotrauma.Networking
                         string subHash = inc.ReadString();
                         CampaignSettings settings = INetSerializableStruct.Read<CampaignSettings>(inc);
 
-                        var matchingSub = SubmarineInfo.SavedSubmarines.FirstOrDefault(s => s.Name == subName && s.MD5Hash.StringRepresentation == subHash);
+                        var matchingSub =
+                            ServerSettings.AllowSubVoting ? 
+                                Voting.HighestVoted<SubmarineInfo>(VoteType.Sub, connectedClients) : 
+                                SubmarineInfo.SavedSubmarines.FirstOrDefault(s => s.Name == subName && s.MD5Hash.StringRepresentation == subHash);
 
                         if (GameStarted)
                         {

Barotrauma/BarotraumaServer/ServerSource/Networking/NetEntityEvent/ServerEntityEventManager.cs

@@ -373,7 +373,7 @@ namespace Barotrauma.Networking
                     //  in which case we'll wait until the timeout runs out before kicking the client
                     List<Client> toKick = inGameClients.FindAll(c =>
                         NetIdUtils.IdMoreRecent((UInt16)(lastSentToAll + 1), c.LastRecvEntityEventID) &&
-                        (firstEventToResend.CreateTime > c.MidRoundSyncTimeOut || lastSentToAnyoneTime > c.MidRoundSyncTimeOut || Timing.TotalTime > c.MidRoundSyncTimeOut + 10.0));
+                        (!c.NeedsMidRoundSync || firstEventToResend.CreateTime > c.MidRoundSyncTimeOut || lastSentToAnyoneTime > c.MidRoundSyncTimeOut || Timing.TotalTime > c.MidRoundSyncTimeOut + 10.0));
                     toKick.ForEach(c =>
                     {
                         DebugConsole.NewMessage(c.Name + " was kicked because they were expecting a very old network event (" + (c.LastRecvEntityEventID + 1).ToString() + ")", Color.Red);

Barotrauma/BarotraumaServer/ServerSource/Networking/Voip/VoipServer.cs

@@ -54,13 +54,14 @@ namespace Barotrauma.Networking
                 {
                     if (recipient == sender) { continue; }
 
-                    if (!CanReceive(sender, recipient, out float distanceFactor)) { continue; }
+                    if (!CanReceive(sender, recipient, out float distanceFactor, out bool isRadio)) { continue; }
 
                     IWriteMessage msg = new WriteOnlyMessage();
 
                     msg.WriteByte((byte)ServerPacketHeader.VOICE);
                     msg.WriteByte((byte)queue.QueueID);
                     msg.WriteRangedSingle(distanceFactor, 0.0f, 1.0f, 8);
+                    msg.WriteBoolean(isRadio);
                     queue.Write(msg);
 
                     netServer.Send(msg, recipient.Connection, DeliveryMethod.Unreliable);
@@ -68,15 +69,17 @@ namespace Barotrauma.Networking
             }
         }
 
-        private static bool CanReceive(Client sender, Client recipient, out float distanceFactor)
+        private static bool CanReceive(Client sender, Client recipient, out float distanceFactor, out bool isRadio)
         {
             if (Screen.Selected != GameMain.GameScreen)
             {
                 distanceFactor = 0.0f;
-                return true;
+                isRadio = false;
+                return true; 
             }
 
             distanceFactor = 0.0f;
+            isRadio = false;
 
             //no-one can hear muted players
             if (sender.Muted) { return false; }
@@ -109,12 +112,14 @@ namespace Barotrauma.Networking
 
                 if (recipientSpectating)
                 {
+                    isRadio = true;
                     if (recipient.SpectatePos == null) { return true; }
                     distanceFactor = MathHelper.Clamp(Vector2.Distance(sender.Character.WorldPosition, recipient.SpectatePos.Value) / senderRadio.Range, 0.0f, 1.0f);
                     return distanceFactor < 1.0f;
                 }
                 else if (recipientRadio != null && recipientRadio.CanReceive(senderRadio))
                 {
+                    isRadio = true;
                     distanceFactor = MathHelper.Clamp(Vector2.Distance(sender.Character.WorldPosition, recipient.Character.WorldPosition) / senderRadio.Range, 0.0f, 1.0f);
                     return true;
                 }