fix coupler issues

derail-valley-modding · Feb 6, 2025 · 704c87c · 704c87c
1 parent 8f1aa2f
commit 704c87c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/SkinManagerMod/Patches/CarPatches.cs b/SkinManagerMod/Patches/CarPatches.cs
@@ -21,12 +21,11 @@ private static void BaseSpawn(TrainCar __result, bool uniqueCar)
         {
             if (!__result.PaintExterior)
             {
-                __result.gameObject.SetActive(false);
-
                 var paintExt = __result.gameObject.AddComponent<TrainCarPaint>();
                 paintExt.sets = Array.Empty<TrainCarPaint.MaterialSet>();
                 paintExt.targetArea = TrainCarPaint.Target.Exterior;
                 paintExt.currentTheme = SkinProvider.CustomDefaultTheme;
+                paintExt.OriginallyAssignedTheme = SkinProvider.CustomDefaultTheme;
                 __result.PaintExterior = paintExt;
 
                 if (__result.carLivery.interiorPrefab)
@@ -35,10 +34,9 @@ private static void BaseSpawn(TrainCar __result, bool uniqueCar)
                     paintInt.sets = Array.Empty<TrainCarPaint.MaterialSet>();
                     paintInt.targetArea = TrainCarPaint.Target.Interior;
                     paintInt.currentTheme = SkinProvider.CustomDefaultTheme;
+                    paintInt.OriginallyAssignedTheme = SkinProvider.CustomDefaultTheme;
                     __result.PaintInterior = paintInt;
                 }
-
-                __result.gameObject.SetActive(true);
             }
 
             if (!uniqueCar)

diff --git a/SkinManagerMod/SkinManager.cs b/SkinManagerMod/SkinManager.cs
@@ -72,6 +72,8 @@ public static (string? exterior, string? interior) GetCurrentCarSkin(TrainCar ca
         /// <summary>Save the specified skin to the given car</summary>
         public static void SetAppliedCarSkin(TrainCar car, string skinName, PaintArea area)
         {
+            if (car.logicCar is null) return;
+
             Main.LogVerbose($"Setting saved skin for car {car.ID} {area} to \"{skinName}\"");
 
             if (area.HasFlag(PaintArea.Exterior))

diff --git a/SkinManagerMod/SkinProvider.cs b/SkinManagerMod/SkinProvider.cs
@@ -788,9 +788,6 @@ internal static void BeginLoadSkin(SkinConfig config, bool forceSync = false)
             }
 
             theme.AddSkin(skin);
-
-            //skin.LoadingFinished += AddSkinTexturesToTheme;
-            //skin.StartLoadFinishedListener();
         }
 
         private static SkinTexture BeginLoadTexture(string fileName, ResourceConfigJson config, string texturePath, bool linear, bool forceSync)