From 1b0360928fd9ea9f3dde41c3e35db9f7ac237418 Mon Sep 17 00:00:00 2001
From: Paint_Ninja <PaintNinja@users.noreply.github.com>
Date: Thu, 18 Apr 2024 21:22:11 +0100
Subject: [PATCH] Fix NPE when acceptableValues in defineInList() does not
 allow nulls, backport of #9903 (#9907)

Co-authored-by: J-RAP <SrRapero720@hotmail.com>
---
 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 513f58c40d..43d91b5e4f 100644
--- a/src/main/java/net/minecraftforge/common/ForgeConfigSpec.java
+++ b/src/main/java/net/minecraftforge/common/ForgeConfigSpec.java
@@ -346,7 +346,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));
         }
         public <T> ConfigValue<List<? extends T>> defineList(String path, List<? extends T> defaultValue, Predicate<Object> elementValidator) {
             return defineList(split(path), defaultValue, elementValidator);