Unstable 0.1500.2.0 (Rokvach's dog edition)

2021-09-10 04:52:34 +09:00
parent e7b7c1a748
commit 1231170fce
126 changed files with 2424 additions and 1083 deletions
@@ -73,19 +73,7 @@ namespace Barotrauma

        public int GetMaxMissionCount()
        {
-#if CLIENT
-            // this seems rather silly, but it matches the radiation enabled check structurally. is this right?
-            if (maxMissionCountText != null && Int32.TryParse(maxMissionCountText.Text, out int result))
-            {
-                return result;
-            }
-            else
-            {
-                return 0;
-            }
-#elif SERVER
-            return GameMain.Server.ServerSettings.MaxMissionCount;
-#endif
+            return GameMain.NetworkMember?.ServerSettings?.MaxMissionCount ?? 0;
        }

        public void ToggleTraitorsEnabled(int dir)