Reorganize a bit and add more comments

NewHorizons/Handlers/InvulnerabilityHandler.cs

@@ -36,6 +36,8 @@ namespace NewHorizons.Handlers
         [HarmonyPatch(typeof(PlayerImpactAudio), nameof(PlayerImpactAudio.OnImpact))]
         public static bool DeathManager_KillPlayer_Prefix()
         {
+            // Base game _invincible is still overriden by high speed impacts
+            // We also are avoiding playing impact related effects by just skipping these methods
             return !_invulnerable;
         }
 

NewHorizons/Handlers/PlayerSpawnHandler.cs

@@ -70,7 +70,14 @@ namespace NewHorizons.Handlers
 
             // Spawn ship
             Delay.FireInNUpdates(SpawnShip, 30);
-            Delay.FireInNUpdates(() =>
+
+            // Have had bug reports (#1034, #975) where sometimes after spawning via vessel warp or ship warp you die from impact velocity after being flung
+            // Something weird must be happening with velocity.
+            // Try to correct it here after the ship is done spawning
+            Delay.FireInNUpdates(() => FixVelocity(shouldWarpInFromVessel, shouldWarpInFromShip), 31);
+        }
+
+        private static void FixVelocity(bool shouldWarpInFromVessel, bool shouldWarpInFromShip)
         {
             var spawnOWRigidBody = GetDefaultSpawn().GetAttachedOWRigidbody();
             if (shouldWarpInFromVessel) spawnOWRigidBody = VesselWarpHandler.VesselSpawnPoint.GetAttachedOWRigidbody();
@@ -81,7 +88,6 @@ namespace NewHorizons.Handlers
             var velocity = spawnVelocity + spawnAngularVelocity;
 
             Locator.GetPlayerBody().SetVelocity(velocity);
-            }, 31);
         }
 
         public static void SpawnShip()

NewHorizons/Handlers/VesselWarpHandler.cs

@@ -56,7 +56,9 @@ namespace NewHorizons.Handlers
             }
 
             if (IsVesselPresentAndActive())
+            {
                 _vesselSpawnPoint = Instance.CurrentStarSystem == "SolarSystem" ? UpdateVessel() : CreateVessel();
+            }
             else
             {
                 var vesselDimension = SearchUtilities.Find("DB_VesselDimension_Body/Sector_VesselDimension");
@@ -84,9 +86,12 @@ namespace NewHorizons.Handlers
             if (_vesselSpawnPoint is VesselSpawnPoint vesselSpawnPoint)
             {
                 NHLogger.LogVerbose("Relative warping into vessel");
-                vesselSpawnPoint.WarpPlayer();//Delay.FireOnNextUpdate(vesselSpawnPoint.WarpPlayer);
+                vesselSpawnPoint.WarpPlayer();
-                //Delay.FireInNUpdates(() => InvulnerabilityHandler.MakeInvulnerable(false), 25);
+
-                Delay.StartCoroutine(RunEveryNFrames(25, vesselSpawnPoint));
+                // #1034 Vessel warp sometimes has the player get flung away into space and die
+                // We do what we do with regular spawns where we keep resetting their position to the right one while invincible until we're relatively certain
+                // that the spawning sequence is done
+                Delay.StartCoroutine(FixPlayerSpawning(25, vesselSpawnPoint));
             }
             else
             {
@@ -98,25 +103,23 @@ namespace NewHorizons.Handlers
             LoadDB();
         }
 
-        private static IEnumerator RunEveryNFrames(int frameInterval, VesselSpawnPoint vesselSpawn)
+        private static IEnumerator FixPlayerSpawning(int frameInterval, VesselSpawnPoint vesselSpawn)
         {
-            int frameCount = 0;
             InvulnerabilityHandler.MakeInvulnerable(true);
 
+            var frameCount = 0;
             while (frameCount <= frameInterval)
             {
                 vesselSpawn.WarpPlayer();
-                if (frameCount == frameInterval)
+                frameCount++;
-                {
+                yield return null; // Wait for the next frame
+            }
+
             InvulnerabilityHandler.MakeInvulnerable(false);
             var playerBody = SearchUtilities.Find("Player_Body").GetAttachedOWRigidbody();
             var resources = playerBody.GetComponent<PlayerResources>();
             resources._currentHealth = 100f;
         }
-                frameCount++;
-                yield return null; // Wait for the next frame
-            }
-        }
 
         public static void LoadDB()
         {

NewHorizons/Main.cs

@@ -613,7 +613,7 @@ namespace NewHorizons
             {
                 IsSystemReady = true;
 
-                // ShipWarpController will handle the invulnerability otherwise
+                // ShipWarpController or VesselWarpHandler will handle the invulnerability otherwise
                 if (!shouldWarpInFromShip && !shouldWarpInFromVessel)
                 {
                     Delay.FireOnNextUpdate(() => InvulnerabilityHandler.MakeInvulnerable(false));