From 4085eb8effc6b8fe8e1b9b9ef3e357ddbed03a9c Mon Sep 17 00:00:00 2001
From: Joshua Thome <joshpthome@gmail.com>
Date: Tue, 21 Mar 2023 21:11:02 -0500
Subject: [PATCH] Fix vessel merge null checks

---
 NewHorizons/External/Configs/StarSystemConfig.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/NewHorizons/External/Configs/StarSystemConfig.cs b/NewHorizons/External/Configs/StarSystemConfig.cs
index 00281a49..c007787d 100644
--- a/NewHorizons/External/Configs/StarSystemConfig.cs
+++ b/NewHorizons/External/Configs/StarSystemConfig.cs
@@ -270,12 +270,12 @@ namespace NewHorizons.External.Configs
             respawnHere = respawnHere || otherConfig.respawnHere;
             startHere = startHere || otherConfig.startHere;
 
-            Vessel = Vessel == null ? otherConfig.Vessel : Vessel;
-            if (Vessel != null)
+            if (Vessel != null && otherConfig.Vessel != null)
             {
                 Vessel.spawnOnVessel = Vessel.spawnOnVessel || otherConfig.Vessel.spawnOnVessel;
                 Vessel.alwaysPresent = Vessel.alwaysPresent || otherConfig.Vessel.alwaysPresent;
             }
+            Vessel = Vessel == null ? otherConfig.Vessel : Vessel;
 
             entryPositions = Concatenate(entryPositions, otherConfig.entryPositions);
             curiosities = Concatenate(curiosities, otherConfig.curiosities);