From 25f36dcbb72e4eecdb32acb7ff570024bd2428fc Mon Sep 17 00:00:00 2001
From: Joshua Thome <joshpthome@gmail.com>
Date: Sun, 16 Feb 2025 16:50:59 -0600
Subject: [PATCH] Handle merging conditionals lists in config

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

diff --git a/NewHorizons/External/Configs/StarSystemConfig.cs b/NewHorizons/External/Configs/StarSystemConfig.cs
index d2afdfd2..257d98e3 100644
--- a/NewHorizons/External/Configs/StarSystemConfig.cs
+++ b/NewHorizons/External/Configs/StarSystemConfig.cs
@@ -389,6 +389,15 @@ namespace NewHorizons.External.Configs
                 GlobalMusic ??= otherConfig.GlobalMusic;
             }
 
+            if (conditionalChecks != null && otherConfig.conditionalChecks != null)
+            {
+                conditionalChecks = Concatenate(conditionalChecks, otherConfig.conditionalChecks);
+            }
+            else
+            {
+                conditionalChecks ??= otherConfig.conditionalChecks;
+            }
+
             entryPositions = Concatenate(entryPositions, otherConfig.entryPositions);
             curiosities = Concatenate(curiosities, otherConfig.curiosities);
             initialReveal = Concatenate(initialReveal, otherConfig.initialReveal);