Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

Barotrauma/BarotraumaClient/ClientSource/Networking/ChatMessage.cs

@@ -150,6 +150,9 @@ namespace Barotrauma.Networking
                     styleSetting = msg.ReadString();
                     txt = TextManager.GetServerMessage(txt).Value;
                     break;
+                case ChatMessageType.BlockedBySpamFilter:
+                    GameMain.Client.BlockedBySpamFilterTimer = BlockedBySpamFilterTime;
+                    break;
             }
 
             if (NetIdUtils.IdMoreRecent(id, LastID))

Barotrauma/BarotraumaClient/ClientSource/Networking/GameClient.cs

@@ -104,6 +104,10 @@ namespace Barotrauma.Networking
         private UInt16 lastQueueChatMsgID = 0; //last message added to the queue
         private readonly List<ChatMessage> chatMsgQueue = new List<ChatMessage>();
 
+        public float BlockedBySpamFilterTimer;
+
+        public bool IsBlockedBySpamFilter => BlockedBySpamFilterTimer > 0.0f;
+
         public UInt16 LastSentEntityEventID;
 
 #if DEBUG
@@ -479,6 +483,8 @@ namespace Barotrauma.Networking
             }
 #endif
 
+            BlockedBySpamFilterTimer -= deltaTime;
+
             foreach (Client c in ConnectedClients)
             {
                 if (c.Character != null && c.Character.Removed) { c.Character = null; }
@@ -868,6 +874,10 @@ namespace Barotrauma.Networking
                 case ServerPacketHeader.ACHIEVEMENT:
                     ReadAchievement(inc);
                     break;
+                case ServerPacketHeader.UNLOCKRECIPE:
+                    Identifier identifier = inc.ReadIdentifier();
+                    GameMain.GameSession.UnlockRecipe(identifier, showNotifications: true);
+                    break;
                 case ServerPacketHeader.ACHIEVEMENT_STAT:
                     ReadAchievementStat(inc);
                     break;
@@ -1069,13 +1079,15 @@ namespace Barotrauma.Networking
             CloseReconnectBox();
 
             GUI.ClearCursorWait();
+            
+            string disconnectMessage = $"Client received a disconnect message. Reason: {disconnectPacket.DisconnectReason}";
+            SteamTimelineManager.OnClientDisconnect(disconnectMessage);
 
             if (disconnectPacket.ShouldCreateAnalyticsEvent)
             {
                 GameAnalyticsManager.AddErrorEventOnce(
                     "GameClient.HandleDisconnectMessage",
-                    GameAnalyticsManager.ErrorSeverity.Debug,
-                    $"Client received a disconnect message. Reason: {disconnectPacket.DisconnectReason}");
+                    GameAnalyticsManager.ErrorSeverity.Debug, disconnectMessage);
             }
             
             if (disconnectPacket.DisconnectReason == DisconnectReason.ServerFull)
@@ -1235,7 +1247,16 @@ namespace Barotrauma.Networking
         
         private void OnConnectionInitializationComplete()
         {
-            UpdatePresence($"-connect \"{ToolBox.EscapeCharacters(ServerName)}\" {string.Join(",", serverEndpoints.Select(e => e.StringRepresentation))}");
+            //don't allow connecting through the friend list if we're connected to localhost (others can't join to "localhost")
+            //we could potentially find the public IP of the server (assuming it's a public server) from the Steam API, but maybe not worth the trouble?
+            bool connectedToLocalHost = serverEndpoints.All(e => e is LidgrenEndpoint lidgrenEndpoint && lidgrenEndpoint.Address.IsLocalHost);
+            string escapedServerName = ServerName.IsNullOrWhiteSpace() ? "Server" : ToolBox.EscapeCharacters(ServerName);
+            string connectCommand =            
+                connectedToLocalHost ? 
+                    string.Empty :
+                    $"-connect \"{escapedServerName}\" {string.Join(",", serverEndpoints.Select(e => e.StringRepresentation))}";
+
+            UpdatePresence(connectCommand);
 
             canStart = true;
             connected = true;
@@ -2150,11 +2171,14 @@ namespace Barotrauma.Networking
 
                         if (lobbyUpdated)
                         {
+                            //we don't want the client to create any network events
+                            //when they modify the server lobby to match the server state as a result of this message
+                            ServerSettings.SuppressNetworkMessages = true;
+
                             var prevDispatcher = GUI.KeyboardDispatcher.Subscriber;
 
                             UInt16 updateID = inc.ReadUInt16();
 
-
                             UInt16 settingsLen = inc.ReadUInt16();
                             byte[] settingsData = inc.ReadBytes(settingsLen);
 
@@ -2299,6 +2323,9 @@ namespace Barotrauma.Networking
                         }
 
                         lastSentChatMsgID = inc.ReadUInt16();
+
+                        ServerSettings.SuppressNetworkMessages = false;
+
                         break;
                     case ServerNetSegment.ClientList:
                         ReadClientList(inc);
@@ -3091,6 +3118,7 @@ namespace Barotrauma.Networking
         public void RequestSelectSub(SubmarineInfo sub, SelectedSubType type)
         {
             if (!HasPermission(ClientPermissions.SelectSub) || sub == null) { return; }
+            if (ServerSettings.SuppressNetworkMessages) { return; }
 
             IWriteMessage msg = new WriteOnlyMessage();
             msg.WriteByte((byte)ClientPacketHeader.SERVER_COMMAND);
@@ -3392,6 +3420,10 @@ namespace Barotrauma.Networking
             {
                 msgBox = GameMain.NetLobbyScreen.ChatInput;
             }
+            if (msgBox != null)
+            {
+                msgBox.Enabled = !IsBlockedBySpamFilter;
+            }
 
             UpdateLogButtonVisibility();
 

Barotrauma/BarotraumaClient/ClientSource/Networking/ServerSettings.cs

@@ -12,6 +12,8 @@ namespace Barotrauma.Networking
         private static readonly LocalizedString packetAmountTooltip = TextManager.Get("ServerSettingsMaxPacketAmountTooltip");
         private static readonly RichString packetAmountTooltipWarning = RichString.Rich($"{packetAmountTooltip}\n\n‖color:gui.red‖{TextManager.Get("PacketLimitWarning")}‖end‖");
 
+        public static bool SuppressNetworkMessages;
+
         partial class NetPropertyData
         {
             public GUIComponent GUIComponent;
@@ -94,6 +96,14 @@ namespace Barotrauma.Networking
                 get
                 {
                     if (GUIComponent == null) { return false; }
+                    if (GUIComponent is GUIDropDown dropDown && 
+                        dropDown.SelectedIndex == -1)
+                    {
+                        //nothing selected in the dropdown
+                        //it's not possible to select nothing via the UI, which means the client cannot have selected anything locally
+                        //(so this must mean that either nothing has been selected yet or that there's nothing in the dropdown)
+                        return false;
+                    }
                     return !PropEquals(TempValue, GUIComponentValue);
                 }
             }
@@ -238,6 +248,7 @@ namespace Barotrauma.Networking
                 int traitorDangerLevel = 0)
         {
             if (!GameMain.Client.HasPermission(Networking.ClientPermissions.ManageSettings)) { return; }
+            if (SuppressNetworkMessages) { return; }
 
             IWriteMessage outMsg = new WriteOnlyMessage();