From 0c00839458a4cc317f00a0fcde703092e6252447 Mon Sep 17 00:00:00 2001
From: EvilFactory <evilfactory@users.noreply.github.com>
Date: Tue, 31 Jan 2023 14:47:27 -0300
Subject: [PATCH] Only send network debug when verbose logging is enabled and
 enabled compatibility for the net lobby screen

---
 .../ClientSource/LuaCs/LuaCsNetworking.cs                 | 8 +++++---
 .../ServerSource/LuaCs/LuaCsNetworking.cs                 | 5 ++++-
 .../ServerSource/Screens/NetLobbyScreen.cs                | 2 +-
 .../SharedSource/LuaCs/LuaCsNetworking.cs                 | 7 +++++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Barotrauma/BarotraumaClient/ClientSource/LuaCs/LuaCsNetworking.cs b/Barotrauma/BarotraumaClient/ClientSource/LuaCs/LuaCsNetworking.cs
index 248f5d64a..bcaa48fff 100644
--- a/Barotrauma/BarotraumaClient/ClientSource/LuaCs/LuaCsNetworking.cs
+++ b/Barotrauma/BarotraumaClient/ClientSource/LuaCs/LuaCsNetworking.cs
@@ -102,9 +102,11 @@ namespace Barotrauma
             {
                 if (!receiveQueue.ContainsKey(id)) { receiveQueue[id] = new Queue<IReadMessage>(); }
                 receiveQueue[id].Enqueue(netMessage);
-#if DEBUG
-                LuaCsLogger.LogMessage($"Received NetMessage with unknown id {id} from server, storing in queue in case we receive the id later.");
-#endif
+
+                if (GameSettings.CurrentConfig.VerboseLogging)
+                {
+                    LuaCsLogger.LogMessage($"Received NetMessage with unknown id {id} from server, storing in queue in case we receive the id later.");
+                }
             }
         }
 
diff --git a/Barotrauma/BarotraumaServer/ServerSource/LuaCs/LuaCsNetworking.cs b/Barotrauma/BarotraumaServer/ServerSource/LuaCs/LuaCsNetworking.cs
index be3a12cc6..35fdb118a 100644
--- a/Barotrauma/BarotraumaServer/ServerSource/LuaCs/LuaCsNetworking.cs
+++ b/Barotrauma/BarotraumaServer/ServerSource/LuaCs/LuaCsNetworking.cs
@@ -54,7 +54,10 @@ namespace Barotrauma
             }
             else
             {
-                LuaCsLogger.LogError($"Received NetMessage for unknown id {id} from {GameServer.ClientLogName(client)}.");
+                if (GameSettings.CurrentConfig.VerboseLogging)
+                {
+                    LuaCsLogger.LogError($"Received NetMessage for unknown id {id} from {GameServer.ClientLogName(client)}.");
+                }
             }
         }
 
diff --git a/Barotrauma/BarotraumaServer/ServerSource/Screens/NetLobbyScreen.cs b/Barotrauma/BarotraumaServer/ServerSource/Screens/NetLobbyScreen.cs
index f1debc112..002481c61 100644
--- a/Barotrauma/BarotraumaServer/ServerSource/Screens/NetLobbyScreen.cs
+++ b/Barotrauma/BarotraumaServer/ServerSource/Screens/NetLobbyScreen.cs
@@ -159,7 +159,7 @@ namespace Barotrauma
             GameModes = GameModePreset.List.ToArray();
         }
         
-        private readonly List<SubmarineInfo> subs;
+        private List<SubmarineInfo> subs;
         public IReadOnlyList<SubmarineInfo> GetSubList() => subs;
 
         public void AddSub(SubmarineInfo sub)
diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsNetworking.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsNetworking.cs
index 08e02845c..e0e305518 100644
--- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsNetworking.cs
+++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsNetworking.cs
@@ -71,11 +71,14 @@ namespace Barotrauma
             }
             else
             {
+                if (GameSettings.CurrentConfig.VerboseLogging)
+                {
 #if SERVER
-                LuaCsLogger.LogError($"Received NetMessage for unknown name {name} from {GameServer.ClientLogName(client)}.");
+                    LuaCsLogger.LogError($"Received NetMessage for unknown name {name} from {GameServer.ClientLogName(client)}.");
 #else
-                LuaCsLogger.LogError($"Received NetMessage for unknown name {name} from server.");
+                    LuaCsLogger.LogError($"Received NetMessage for unknown name {name} from server.");
 #endif
+                }
             }
         }