From 91ff901972988eaa60ff1996ede87da23403f11f Mon Sep 17 00:00:00 2001 From: Noah Pilarski Date: Sat, 3 Sep 2022 20:06:20 -0400 Subject: [PATCH] Don't save relative location for now --- NewHorizons/Patches/NomaiCoordinatePatches.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/NewHorizons/Patches/NomaiCoordinatePatches.cs b/NewHorizons/Patches/NomaiCoordinatePatches.cs index dc0e7bb8..a610f939 100644 --- a/NewHorizons/Patches/NomaiCoordinatePatches.cs +++ b/NewHorizons/Patches/NomaiCoordinatePatches.cs @@ -15,16 +15,25 @@ namespace NewHorizons.Patches return true; } + // TODO: Figure out what causes player to fall through vessel when warping. Saving relative location will be disabled until then. + public static bool saveRelativeLocation = false; + [HarmonyPrefix] [HarmonyPatch(typeof(VesselWarpController), nameof(VesselWarpController.WarpVessel))] public static bool VesselWarpController_WarpVessel(VesselWarpController __instance, bool debugWarp) { if (!Main.Instance.IsWarpingFromVessel && TimeLoop.GetLoopCount() < 2) Achievements.Earn(Achievements.Type.BEGINNERS_LUCK); - VesselWarpController.s_playerWarpLocation = new RelativeLocationData(Locator.GetPlayerBody(), __instance.transform); - VesselWarpController.s_relativeLocationSaved = !debugWarp; + + if (saveRelativeLocation) + { + VesselWarpController.s_playerWarpLocation = new RelativeLocationData(Locator.GetPlayerBody(), __instance.transform); + VesselWarpController.s_relativeLocationSaved = !debugWarp; + } + if (!Main.Instance.IsWarpingFromVessel) PlayerData.SaveWarpedToTheEye(TimeLoopUtilities.GetVanillaSecondsRemaining()); + LoadManager.EnableAsyncLoadTransition(); return false; }