From d31ea640f9d8d2ed8aa97a9c903e42f14cb454c6 Mon Sep 17 00:00:00 2001
From: J-RAP <SrRapero720@hotmail.com>
Date: Sat, 13 Apr 2024 05:47:35 -0600
Subject: [PATCH] Fix NPE when acceptableValues in defineInList() does not
 allow nulls, fixes #9300 (#9903)

---
 src/main/java/net/minecraftforge/common/ForgeConfigSpec.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/minecraftforge/common/ForgeConfigSpec.java b/src/main/java/net/minecraftforge/common/ForgeConfigSpec.java
index d31e0a055a..37c82b3841 100644
--- a/src/main/java/net/minecraftforge/common/ForgeConfigSpec.java
+++ b/src/main/java/net/minecraftforge/common/ForgeConfigSpec.java
@@ -330,7 +330,7 @@ public class ForgeConfigSpec extends UnmodifiableConfigWrapper<UnmodifiableConfi
             return defineInList(path, () -> defaultValue, acceptableValues);
         }
         public <T> ConfigValue<T> defineInList(List<String> path, Supplier<T> defaultSupplier, Collection<? extends T> acceptableValues) {
-            return define(path, defaultSupplier, acceptableValues::contains);
+            return define(path, defaultSupplier, o -> o != null && acceptableValues.contains(o));
         }
         //endregion