From e56a3e6440e2b11b10ae004aeb3d55ac0c3e0671 Mon Sep 17 00:00:00 2001 From: Noah Pilarski Date: Tue, 4 Jun 2024 18:34:38 -0400 Subject: [PATCH] also do vessel here --- NewHorizons/Main.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/NewHorizons/Main.cs b/NewHorizons/Main.cs index ca7f7271..fab88744 100644 --- a/NewHorizons/Main.cs +++ b/NewHorizons/Main.cs @@ -998,9 +998,13 @@ namespace NewHorizons { CurrentStarSystem = _defaultSystemOverride; - if (BodyDict.TryGetValue(_defaultSystemOverride, out var bodies) && bodies.Any(x => x.Config?.Spawn?.shipSpawn != null)) + // #738 - Sometimes the override will not support spawning regularly, so always warp in if possible + if (SystemDict[_defaultSystemOverride].Config.Vessel?.spawnOnVessel == true) + { + IsWarpingFromVessel = true; + } + else if (BodyDict.TryGetValue(_defaultSystemOverride, out var bodies) && bodies.Any(x => x.Config?.Spawn?.shipSpawn != null)) { - // #738 - Sometimes the override will not support spawning regularly, so always warp in if possible IsWarpingFromShip = true; } else