From b31fbe23da4ec8c8679508c0903c0b67a79727f4 Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue, 4 Jun 2019 15:36:58 +0300
Subject: [PATCH] (618410bf9) Fixed clients crashing when opening the server
 settings menu

---
 .../BarotraumaClient/Source/Networking/ServerSettings.cs  | 3 ++-
 .../BarotraumaShared/Source/Networking/ServerSettings.cs  | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Barotrauma/BarotraumaClient/Source/Networking/ServerSettings.cs b/Barotrauma/BarotraumaClient/Source/Networking/ServerSettings.cs
index a4e27b2e1..2af9e3428 100644
--- a/Barotrauma/BarotraumaClient/Source/Networking/ServerSettings.cs
+++ b/Barotrauma/BarotraumaClient/Source/Networking/ServerSettings.cs
@@ -464,7 +464,8 @@ namespace Barotrauma.Networking
                 ((GUIComponent)obj).Visible = !((GUIComponent)obj).Visible;
                 return true;
             };
-            
+
+            InitMonstersEnabled();
             List<string> monsterNames = MonsterEnabled.Keys.ToList();
             tempMonsterEnabled = new Dictionary<string, bool>(MonsterEnabled);
             foreach (string s in monsterNames)
diff --git a/Barotrauma/BarotraumaShared/Source/Networking/ServerSettings.cs b/Barotrauma/BarotraumaShared/Source/Networking/ServerSettings.cs
index c4725de49..01ccc1c0e 100644
--- a/Barotrauma/BarotraumaShared/Source/Networking/ServerSettings.cs
+++ b/Barotrauma/BarotraumaShared/Source/Networking/ServerSettings.cs
@@ -656,7 +656,7 @@ namespace Barotrauma.Networking
             private set;
         } = new List<Pair<int, int>>();
 
-        public void ReadMonsterEnabled(NetBuffer inc)
+        private void InitMonstersEnabled()
         {
             //monster spawn settings
             if (MonsterEnabled == null)
@@ -673,7 +673,11 @@ namespace Barotrauma.Networking
                     if (!MonsterEnabled.ContainsKey(s)) MonsterEnabled.Add(s, true);
                 }
             }
+        }
 
+        public void ReadMonsterEnabled(NetBuffer inc)
+        {
+            InitMonstersEnabled();
             List<string> monsterNames = MonsterEnabled.Keys.ToList();
             foreach (string s in monsterNames)
             {
@@ -681,7 +685,7 @@ namespace Barotrauma.Networking
             }
             inc.ReadPadBits();
         }
-        
+
         public void WriteMonsterEnabled(NetBuffer msg, Dictionary<string, bool> monsterEnabled = null)
         {
             //monster spawn settings