Fix #36 hang on load if license is acquired

katycat5e · Aug 28, 2021 · 5947c14 · 5947c14
1 parent 92f59ea
commit 5947c14
Showing 1 changed file with 21 additions and 11 deletions.
diff --git a/PJSaveLoadManager.cs b/PJSaveLoadManager.cs
@@ -110,17 +110,7 @@ public static void OnSaveGameLoaded()
 
             if( loadedData != null )
             {
-                if( loadedData.GetInt(VERSION_KEY) == CURRENT_DATA_VERSION )
-                {
-                    if( loadedData.GetBool(HAS_LICENSE_P1_KEY) == true )
-                    {
-                        PassengerJobs.Log("Acquiring passengers license");
-                        LicenseManager.AcquireJobLicense(PassLicenses.Passengers1);
-
-                        Inventory.Instance.RemoveMoney(PassengerLicenseUtil.PASS1_COST);
-                    }
-                }
-                else
+                if( loadedData.GetInt(VERSION_KEY) != CURRENT_DATA_VERSION )
                 {
                     PassengerJobs.Warning("Save file contains incompatible data version");
                     loadedData = null;
@@ -132,6 +122,17 @@ public static void OnSaveGameLoaded()
             }
         }
 
+        public static void OnInventoryStarted()
+        {
+            if( (loadedData != null) && (loadedData.GetBool(HAS_LICENSE_P1_KEY) == true) && Inventory.Exists )
+            {
+                PassengerJobs.Log("Acquiring passengers license");
+                LicenseManager.AcquireJobLicense(PassLicenses.Passengers1);
+
+                Inventory.Instance.RemoveMoney(PassengerLicenseUtil.PASS1_COST);
+            }
+        }
+
         public static void InjectJobChains( JobsSaveGameData mainJobData )
         {
             // inject job chains into main game data
@@ -198,6 +199,15 @@ static void OnSaveLoaded( bool __result )
         }
     }
 
+    [HarmonyPatch(typeof(StartingItemsController), nameof(StartingItemsController.AddStartingItems))]
+    static class StartingItemsController_Patch
+    {
+        static void Postfix()
+        {
+            PJSaveLoadManager.OnInventoryStarted();
+        }
+    }
+
     [HarmonyPatch(typeof(JobChainController), nameof(JobChainController.GetJobChainSaveData))]
     static class JCC_GetJobChainSaveData_Patch
     {