From 5d93b7c3cfe14c3870cb22e296ec70a80d894f7f Mon Sep 17 00:00:00 2001
From: Nick <nicholasconnors@hotmail.ca>
Date: Tue, 21 Mar 2023 20:13:51 -0400
Subject: [PATCH] Fix star system vessel merge NRE

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

diff --git a/NewHorizons/External/Configs/StarSystemConfig.cs b/NewHorizons/External/Configs/StarSystemConfig.cs
index 00281a49..845696b9 100644
--- a/NewHorizons/External/Configs/StarSystemConfig.cs
+++ b/NewHorizons/External/Configs/StarSystemConfig.cs
@@ -270,12 +270,15 @@ 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;
             }
+            else
+            {
+                Vessel ??= otherConfig.Vessel;
+            }
 
             entryPositions = Concatenate(entryPositions, otherConfig.entryPositions);
             curiosities = Concatenate(curiosities, otherConfig.curiosities);