Fix stock SaveUpgradePipeline bug where it blows up if a script doesn…

…'t support both sfs and craft contexts. Bump version.
KSPModdingLibs · Dec 7, 2022 · ac8dbda · ac8dbda
1 parent f695087
commit ac8dbda
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/GameData/KSPCommunityFixes/KSPCommunityFixes.version b/GameData/KSPCommunityFixes/KSPCommunityFixes.version
@@ -2,7 +2,7 @@
   "NAME": "KSPCommunityFixes",
   "URL": "https://raw.githubusercontent.com/KSPModdingLibs/KSPCommunityFixes/master/GameData/KSPCommunityFixes/KSPCommunityFixes.version",
   "DOWNLOAD": "https://github.com/KSPModdingLibs/KSPCommunityFixes/releases",
-  "VERSION": {"MAJOR": 1, "MINOR": 22, "PATCH": 1, "BUILD": 0},
+  "VERSION": {"MAJOR": 1, "MINOR": 22, "PATCH": 2, "BUILD": 0},
   "KSP_VERSION": {"MAJOR": 1, "MINOR": 12, "PATCH": 3},
   "KSP_VERSION_MIN": {"MAJOR": 1, "MINOR": 8, "PATCH": 0},
   "KSP_VERSION_MAX": {"MAJOR": 1, "MINOR": 12, "PATCH": 3}

diff --git a/KSPCommunityFixes/Modding/ModUpgradePipeline.cs b/KSPCommunityFixes/Modding/ModUpgradePipeline.cs
@@ -287,8 +287,11 @@ private static bool SaveUpgradePipeline_RunIteration_Prefix(SaveUpgradePipeline.
             ConfigNode curNode = node ?? srcNode;
             for(int i = scripts.Count; i-- > 0;)
             {
-                // Change: set assembly so VersionTest will use the right version
+                // Change: skip if doesn't apply in this context.
                 var uSc = scripts[i];
+                if (!uSc.AppliesInContext(ctx))
+                    continue;
+                // Change: set assembly so VersionTest will use the right version
                 SetAssembly(uSc);
                 var testResult = __instance.RunTest(uSc, curNode, ctx);
                 _currentAsm = null;
@@ -317,17 +320,21 @@ private static bool SaveUpgradePipeline_RunIteration_Prefix(SaveUpgradePipeline.
             }
             for(int i = scripts.Count; i-- > 0;)
             {
-                if (row[scripts[i]].testResult == TestResult.Upgradeable)
+                // Change: skip if doesn't apply in this context.
+                var uSc = scripts[i];
+                if (!uSc.AppliesInContext(ctx))
+                    continue;
+
+                if (row[uSc].testResult == TestResult.Upgradeable)
                 {
-                    if (lastRow != null && lastRow[scripts[i]].upgraded)
+                    if (lastRow != null && lastRow[uSc].upgraded)
                     {
-                        row[scripts[i]].testResult = TestResult.Pass;
-                        row[scripts[i]].upgraded = true;
+                        row[uSc].testResult = TestResult.Pass;
+                        row[uSc].upgraded = true;
                     }
                     else
                     {
                         // Change: Set assembly just in case (not used yet)
-                        var uSc = scripts[i];
                         SetAssembly(uSc);
                         node = __instance.RunUpgrade(uSc, node, ctx);
                         _currentAsm = null;

diff --git a/KSPCommunityFixes/Properties/AssemblyInfo.cs b/KSPCommunityFixes/Properties/AssemblyInfo.cs
@@ -30,7 +30,7 @@
 //      Revision
 //
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.22.1.0")]
+[assembly: AssemblyFileVersion("1.22.2.0")]
 
-[assembly: KSPAssembly("KSPCommunityFixes", 1, 22, 1)]
+[assembly: KSPAssembly("KSPCommunityFixes", 1, 22, 2)]
 [assembly: KSPAssemblyDependency("MultipleModulePartAPI", 1, 0, 0)]
diff --git a/README.md b/README.md
@@ -153,6 +153,9 @@ If doing so in the `Debug` configuration and if your KSP install is modified to
 
 ### Changelog
 
+##### 1.22.1
+- Fix stock bug in SaveUpgradePipeline exposed by ModUpgradePipeline: the stock SaveUpgradePipeline blows up if an UpgradeScript does not apply to both sfs and craft contexts.
+
 ##### 1.22.1
 - Add KSPAssembly attribute to MultipleModulePartAPI as well, and add the KSPAssemblyDependency to KSPCommunityFixes just in case.
 - Set AssemblyVersion to 1.0 and only increment AssemblyFileVersion and KSPAssembly