From 8882b70b7089811485a8d92cfde6037ff943d9dd Mon Sep 17 00:00:00 2001 From: Nick Date: Sun, 4 Feb 2024 01:04:35 -0500 Subject: [PATCH] Luna was having an NRE in the runwhen so skip it if we don't need it --- .../Patches/EyeScenePatches/SubmitActionLoadScenePatches.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NewHorizons/Patches/EyeScenePatches/SubmitActionLoadScenePatches.cs b/NewHorizons/Patches/EyeScenePatches/SubmitActionLoadScenePatches.cs index 891f439c..931389f0 100644 --- a/NewHorizons/Patches/EyeScenePatches/SubmitActionLoadScenePatches.cs +++ b/NewHorizons/Patches/EyeScenePatches/SubmitActionLoadScenePatches.cs @@ -1,3 +1,4 @@ +using Autodesk.Fbx; using HarmonyLib; using NewHorizons.Utility.Files; using NewHorizons.Utility.OWML; @@ -26,6 +27,9 @@ namespace NewHorizons.Patches.EyeScenePatches Main.Instance.IsWarpingBackToEye = true; __instance._sceneToLoad = SubmitActionLoadScene.LoadableScenes.GAME; } + + // Don't bother going through this stuff if we don't have to + if (AssetBundleUtilities.AreRequiredAssetsLoaded()) return true; // modified from patched function SubmitActionConfirm_ConfirmSubmit(__instance);