Maybe fix warp bug

NewHorizons/Builder/General/PlanetDestroyer.cs

@@ -85,6 +85,8 @@ namespace NewHorizons.Builder.General
                 }
             }
 
+            try
+            {
                 if (ao.GetAstroObjectName() == AstroObject.Name.CaveTwin || ao.GetAstroObjectName() == AstroObject.Name.TowerTwin)
                 {
                     if (ao.GetAstroObjectName() == AstroObject.Name.TowerTwin)
@@ -173,6 +175,11 @@ namespace NewHorizons.Builder.General
                     GameObject.Find("BackRaft_Body").SetActive(false);
                     GameObject.Find("SealRaft_Body").SetActive(false);
                 }
+            }
+            catch(Exception e)
+            {
+                Logger.LogWarning($"Exception thrown when trying to delete bodies related to [{ao.name}]: {e.Message}, {e.StackTrace}");
+            }
 
             // Deal with proxies
             foreach (var p in GameObject.FindObjectsOfType<ProxyOrbiter>())
@@ -185,7 +192,8 @@ namespace NewHorizons.Builder.General
             }
             RemoveProxy(ao.name.Replace("_Body", ""));
 
-            ao.transform.root.gameObject.SetActive(false);
+            // For TH we wait until the player is fully loaded in
+            Main.Instance.ModHelper.Events.Unity.RunWhen(() => Main.IsSystemReady, () => ao.transform.root.gameObject.SetActive(false));
 
             foreach (ProxyBody proxy in GameObject.FindObjectsOfType<ProxyBody>())
             {

NewHorizons/Builder/General/SpawnPointBuilder.cs

@@ -60,7 +60,7 @@ namespace NewHorizons.Builder.General
             if(!Main.Instance.IsWarping && module.StartWithSuit && !suitUpQueued)
             {
                 suitUpQueued = true;
-                Main.Instance.ModHelper.Events.Unity.FireInNUpdates(() => SuitUp(), 4);
+                Main.Instance.ModHelper.Events.Unity.RunWhen(() => Main.IsSystemReady, () => SuitUp());
             }
 
             Logger.Log("Made spawnpoint on [" + body.name + "]");

NewHorizons/Builder/Props/DetailBuilder.cs

@@ -81,7 +81,7 @@ namespace NewHorizons.Builder.Props
                 if(component is AnglerfishAnimController && component.GetComponentInParent<AnglerfishController>() == null)
                     Main.Instance.ModHelper.Events.Unity.FireOnNextUpdate(() => (component as AnglerfishAnimController).enabled = false);
 
-                if (component is Animator) Main.Instance.ModHelper.Events.Unity.FireInNUpdates(() => (component as Animator).enabled = true, 5);
+                if (component is Animator) Main.Instance.ModHelper.Events.Unity.RunWhen(() => Main.IsSystemReady, () => (component as Animator).enabled = true);
                 if (component is Collider) Main.Instance.ModHelper.Events.Unity.FireOnNextUpdate(() => (component as Collider).enabled = true);
 
                 if(component is Shape) Main.Instance.ModHelper.Events.Unity.FireOnNextUpdate(() => (component as Shape).enabled = true);

NewHorizons/Main.cs

@@ -43,6 +43,7 @@ namespace NewHorizons
         public static Dictionary<string, AssetBundle> AssetBundles = new Dictionary<string, AssetBundle>();
         public static List<IModBehaviour> MountedAddons = new List<IModBehaviour>();
 
+        public static bool IsSystemReady { get; private set; }
         public static float FurthestOrbit { get; set; } = 50000f;
 
         public string CurrentStarSystem { get { return Instance._currentStarSystem; } }
@@ -91,6 +92,7 @@ namespace NewHorizons
             SceneManager.sceneLoaded += OnSceneLoaded;
             Instance = this;
             GlobalMessenger<DeathType>.AddListener("PlayerDeath", OnDeath);
+            GlobalMessenger.AddListener("WakeUp", new Callback(OnWakeUp));
             ShaderBundle = Main.Instance.ModHelper.Assets.LoadBundle("AssetBundle/shader");
             BodyDict["SolarSystem"] = new List<NewHorizonsBody>();
             SystemDict["SolarSystem"] = new NewHorizonsSystem("SolarSystem", new StarSystemConfig(null), this);
@@ -170,6 +172,12 @@ namespace NewHorizons
             Logger.Log($"Destroying NewHorizons");
             SceneManager.sceneLoaded -= OnSceneLoaded;
             GlobalMessenger<DeathType>.RemoveListener("PlayerDeath", OnDeath);
+            GlobalMessenger.RemoveListener("WakeUp", new Callback(OnWakeUp));
+        }
+
+        private static void OnWakeUp()
+        {
+            IsSystemReady = true;
         }
 
         void OnSceneLoaded(Scene scene, LoadSceneMode mode)
@@ -185,6 +193,8 @@ namespace NewHorizons
 
             if(scene.name == "SolarSystem")
             {
+                IsSystemReady = false;
+
                 HeavenlyBodyBuilder.Reset();
                 NewHorizonsData.Load();
                 SignalBuilder.Init();
@@ -203,8 +213,8 @@ namespace NewHorizons
                 if (HasWarpDrive == true) EnableWarpDrive();
 
                 Logger.Log($"Is the player warping in? {IsWarping}");
-                if (IsWarping && _shipWarpController) Instance.ModHelper.Events.Unity.FireInNUpdates(() => _shipWarpController.WarpIn(WearingSuit), 5);
+                if (IsWarping && _shipWarpController) Instance.ModHelper.Events.Unity.RunWhen(() => IsSystemReady, () => _shipWarpController.WarpIn(WearingSuit));
-                else Instance.ModHelper.Events.Unity.FireInNUpdates(() => GameObject.FindObjectOfType<PlayerSpawner>().DebugWarp(SystemDict[_currentStarSystem].SpawnPoint), 5);
+                else Instance.ModHelper.Events.Unity.RunWhen(() => IsSystemReady, () => FindObjectOfType<PlayerSpawner>().DebugWarp(SystemDict[_currentStarSystem].SpawnPoint));
                 IsWarping = false;
 
                 var map = GameObject.FindObjectOfType<MapController>();