Fixed bug, where dedicated servers would crash when starting with the…

… plugin a new world
thorwin99 · Mar 5, 2020 · aee1a1d · aee1a1d
1 parent 1467b35
commit aee1a1d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/SEWorldGenPlugin/GUI/PluginWorldSettings.cs b/SEWorldGenPlugin/GUI/PluginWorldSettings.cs
@@ -18,7 +18,6 @@ namespace SEWorldGenPlugin.GUI
 {
     public class PluginWorldSettings : MyGuiScreenWorldSettings
     {
-        public static MyGuiScreenWorldSettings Static;
         public MyObjectBuilder_PluginSettings PluginSettings;
 
         private MyGuiControlCheckbox m_enablePlugin;
@@ -48,7 +47,7 @@ public PluginWorldSettings(bool displayTabScenario = true, bool displayTabWorksh
         {
         }
 
-        public PluginWorldSettings(MyObjectBuilder_Checkpoint checkpoint, string path, bool displayTabScenario = true, bool displayTabWorkshop = true, bool displayTabCustom = true, bool isCloudPath = false) : base(checkpoint, path, displayTabScenario, displayTabWorkshop, displayTabCustom, isCloudPath)
+        public PluginWorldSettings(MyObjectBuilder_Checkpoint checkpoint, string path, bool displayTabScenario = true, bool displayTabWorkshop = true, bool displayTabCustom = true) : base(checkpoint, path, displayTabScenario, displayTabWorkshop, displayTabCustom)
         {
             Static = this;
             m_isNewGame = (checkpoint == null);

diff --git a/SEWorldGenPlugin/Generator/SystemGenerator.cs b/SEWorldGenPlugin/Generator/SystemGenerator.cs
@@ -65,6 +65,7 @@ public override void Init(MyObjectBuilder_SessionComponent sessionComponent)
             m_seed = MySession.Static.Settings.ProceduralSeed + MyRandom.Instance.CreateRandomSeed();
 
             m_settings = SettingsSession.Static.Settings.GeneratorSettings;
+            //FilterDefinitions();
 
             if (b == null || m_objects == null || m_objects.Count == 0)
             {

diff --git a/SEWorldGenPlugin/MySettings.cs b/SEWorldGenPlugin/MySettings.cs
@@ -60,9 +60,6 @@ public void LoadSettings()
                 Settings = new MyObjectBuilder_PluginSettings();
                 Settings.GeneratorSettings.PlanetSettings.Moons.Add("Moon");
                 Settings.GeneratorSettings.PlanetSettings.Moons.Add("Titan");
-
-                if (Sync.IsDedicated)
-                    Settings.Enable = true;
             }
             Settings.Verify();
         }

diff --git a/SEWorldGenPlugin/Session/SettingsSession.cs b/SEWorldGenPlugin/Session/SettingsSession.cs
@@ -39,7 +39,15 @@ public override void LoadData()
                     var s = new MySettings();
                     s.LoadSettings();
                 }
-                Settings = MySettings.Static.SessionSettings;
+                if(MySettings.Static.SessionSettings != null)
+                {
+                    Settings = MySettings.Static.SessionSettings;
+                }
+                else
+                {
+                    Settings = MySettings.Static.Settings;
+                }
+
                 MySettings.Static.SessionSettings = null;
             }
         }