From 766319d8779e2ba95abf16e2fad79353bb647a1f Mon Sep 17 00:00:00 2001
From: Frank <developer@ambertation.de>
Date: Sat, 8 Oct 2022 20:28:43 +0200
Subject: [PATCH] [Fix] Make sure we can fallback to a non-null
 NoneFeatureConfiguration (quiqueck/BetterNether#48)

---
 .../api/v3/levelgen/features/BCLFeatureBuilder.java    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLFeatureBuilder.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLFeatureBuilder.java
index 2ff8f691..f5c8c048 100644
--- a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLFeatureBuilder.java
+++ b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLFeatureBuilder.java
@@ -665,7 +665,15 @@ public abstract class BCLFeatureBuilder<F extends Feature<FC>, FC extends Featur
 
         @Override
         public FC createConfiguration() {
-            if (configuration == null) return (FC) NoneFeatureConfiguration.NONE;
+            if (configuration == null) {
+                //Moonlight Lib seems to trigger a load of our data before
+                //NoneFeatureConfiguration.NONE is initialized. This Code
+                // is meant to prevent that...
+                if (NoneFeatureConfiguration.NONE != null)
+                    return (FC) NoneFeatureConfiguration.NONE;
+                
+                return (FC) NoneFeatureConfiguration.INSTANCE;
+            }
             return configuration;
         }
     }