From f60620c5a54d8f55cc4e3b08c3933f984ad96b4d Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 6 Jul 2023 00:21:20 -0400 Subject: [PATCH] Prevent softlock due to slide reels when changing system/reloading --- NewHorizons/Main.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NewHorizons/Main.cs b/NewHorizons/Main.cs index 6ef0e65f..3036f720 100644 --- a/NewHorizons/Main.cs +++ b/NewHorizons/Main.cs @@ -811,6 +811,12 @@ namespace NewHorizons return; } + if (LoadManager.GetCurrentScene() == OWScene.SolarSystem || LoadManager.GetCurrentScene() == OWScene.EyeOfTheUniverse) + { + // Slide reel unloading is tied to being removed from the sector, so we do that here to prevent a softlock + Locator.GetPlayerSectorDetector().RemoveFromAllSectors(); + } + if (IsChangingStarSystem) return; IsWarpingFromShip = warp;