fix patches & null skin application

derail-valley-modding · Jun 30, 2023 · 2cda7da · 2cda7da
1 parent 9b5c8e5
commit 2cda7da
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 23 deletions.
diff --git a/SkinManagerMod/CarPatches.cs b/SkinManagerMod/CarPatches.cs
@@ -7,40 +7,33 @@
 
 namespace SkinManagerMod
 {
-    [HarmonyPatch(typeof(CarSpawner), "SpawnCar")]
+    [HarmonyPatch(typeof(CarSpawner))]
     class CarSpawner_SpawnCar_Patch
     {
-        static void Postfix(TrainCar __result)
+        [HarmonyPostfix]
+        [HarmonyPatch(nameof(CarSpawner.SpawnCar))]
+        [HarmonyPatch(nameof(CarSpawner.SpawnLoadedCar))]
+        static void SpawnCar(TrainCar __result)
         {
             var skin = SkinManager.GetCurrentCarSkin(__result);
-            if (!skin.IsDefault)
+            if ((skin != null) && !skin.IsDefault)
             {
                 // only need to replace textures if not staying with default skin
                 SkinManager.ApplySkin(__result, skin);
             }
         }
     }
 
-    [HarmonyPatch(typeof(CarSpawner), "SpawnLoadedCar")]
-    class CarSpawner_SpawnExistingCar_Patch
-    {
-        static void Postfix(TrainCar __result)
-        {
-            var skin = SkinManager.GetCurrentCarSkin(__result);
-            if (!skin.IsDefault)
-            {
-                SkinManager.ApplySkin(__result, skin);
-            }
-        }
-    }
-
-    [HarmonyPatch(typeof(TrainCar), "LoadInterior")]
+    [HarmonyPatch(typeof(TrainCar))]
     class TrainCar_LoadInterior_Patch
     {
-        static void Postfix(TrainCar __instance)
+        [HarmonyPostfix]
+        [HarmonyPatch(nameof(TrainCar.LoadInterior))]
+        [HarmonyPatch(nameof(TrainCar.LoadExternalInteractables))]
+        static void LoadInterior(TrainCar __instance)
         {
             var skin = SkinManager.GetCurrentCarSkin(__instance);
-            if (!skin.IsDefault)
+            if ((skin != null) && !skin.IsDefault)
             {
                 SkinManager.ApplySkinToInterior(__instance, skin);
             }

diff --git a/SkinManagerMod/SkinManager.cs b/SkinManagerMod/SkinManager.cs
@@ -73,7 +73,11 @@ public static Skin GetNewSkin(TrainCarLivery carType)
             }
 
             // fall back to default skin
-            return defaultSkins[carType.id];
+            if (defaultSkins.TryGetValue(carType.id, out Skin skin))
+            {
+                return skin;
+            }
+            return null;
         }
 
         /// <summary>Get the currently assigned skin for given car, or a new one if none is assigned</summary>
@@ -221,11 +225,15 @@ public static void ReloadSkins(TrainCarLivery livery)
             foreach (var car in carsInScene)
             {
                 var toApply = GetCurrentCarSkin(car);
-                ApplySkin(car, toApply);
 
-                if (car.IsInteriorLoaded)
+                if (toApply != null)
                 {
-                    ApplySkinToInterior(car, toApply);
+                    ApplySkin(car, toApply);
+
+                    if (car.IsInteriorLoaded)
+                    {
+                        ApplySkinToInterior(car, toApply);
+                    }
                 }
             }
         }