Reload MFSSettings via ModuleManagerPostLoad

Fixes #99 Reloading the database in various scenes might not be a well-handled idea.
KSP-RO · Mar 24, 2022 · 8161c7e · 8161c7e
1 parent bcdef30
commit 8161c7e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/Source/Engines/RFSettings.cs b/Source/Engines/RFSettings.cs
@@ -97,6 +97,8 @@ public static string GetVersion()
             return version;
         }
 
+        public void ModuleManagerPostLoad() => Init();
+
         private void Init()
         {
             ConfigNode node = GameDatabase.Instance.GetConfigNodes("RFSETTINGS").Last();

diff --git a/Source/Tanks/MFSSettings.cs b/Source/Tanks/MFSSettings.cs
@@ -77,8 +77,14 @@ public static void TryInitialize()
             if (!Initialized) Initialize();
         }
 
-        public static void Initialize ()
+        public static void ModuleManagerPostLoad() => Initialize();
+
+        public static void Initialize()
         {
+            resourceVsps.Clear();
+            resourceConductivities.Clear();
+            resourceGasses.Clear();
+
             // fill vsps & conductivities
             foreach (ConfigNode n in GameDatabase.Instance.GetConfigNodes("RESOURCE_DEFINITION"))
             {
@@ -96,7 +102,7 @@ public static void Initialize ()
             ConfigNode node = GameDatabase.Instance.GetConfigNodes("MFSSETTINGS").LastOrDefault();
             Debug.Log ("[MFS] Loading global settings");
 
-			if (node != null) {
+            if (node != null) {
                 node.TryGetValue("useRealisticMass", ref useRealisticMass);
                 node.TryGetValue("tankMassMultiplier", ref tankMassMultiplier);
                 node.TryGetValue("baseCostPV", ref baseCostPV);
@@ -106,21 +112,20 @@ public static void Initialize ()
                 node.TryGetValue("basemassUseTotalVolume", ref basemassUseTotalVolume);
                 node.TryGetValue("radiatorMinTempMult", ref radiatorMinTempMult);
 
-                ConfigNode ignoreNode = node.GetNode("IgnoreFuelsForFill");
-				if (ignoreNode != null) {
-					foreach (ConfigNode.Value v in ignoreNode.values) {
+                ignoreFuelsForFill.Clear();
+                if (node.GetNode("IgnoreFuelsForFill") is ConfigNode ignoreNode)
+                    foreach (ConfigNode.Value v in ignoreNode.values)
                         ignoreFuelsForFill.Add(v.name);
-					}
-				}
-			}
+            }
 
+            tankDefinitions.Clear();
             foreach (ConfigNode defNode in GameDatabase.Instance.GetConfigNodes("TANK_DEFINITION")) {
                 if (tankDefinitions.ContainsKey(defNode.GetValue("name"))) {
                     Debug.LogWarning ("[MFS] Ignored duplicate definition of tank type " + defNode.GetValue ("name"));
                 } else {
                     var def = new Tanks.TankDefinition(defNode);
                     tankDefinitions.Add(def.name, def);
-				}
+                }
             }
             Initialized = true;
         }

diff --git a/Source/Tanks/ModuleFuelTanks.cs b/Source/Tanks/ModuleFuelTanks.cs
@@ -120,7 +120,7 @@ public override void OnAwake()
 
             if (HighLogic.LoadedScene == GameScenes.LOADING)
                 unmanagedResources = new Dictionary<string, UnmanagedResource>();
-            else
+            else if (HighLogic.LoadedSceneIsFlight || HighLogic.LoadedSceneIsEditor)
             {
                 var mft = part.partInfo.partPrefab.FindModuleImplementing<ModuleFuelTanks>();
                 unmanagedResources = mft.unmanagedResources;