From 7a8fae63534acc1379006d29784fa1b97d5bf06c Mon Sep 17 00:00:00 2001
From: Zach Levis <zml@aoeu.xyz>
Date: Wed, 4 Nov 2020 21:24:07 -0800
Subject: [PATCH] core: Be more defensive about getting null lists

---
 .../ninja/leaping/configurate/SimpleConfigurationNode.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configurate-core/src/main/java/ninja/leaping/configurate/SimpleConfigurationNode.java b/configurate-core/src/main/java/ninja/leaping/configurate/SimpleConfigurationNode.java
index e3c0e20ab..2c14eea97 100644
--- a/configurate-core/src/main/java/ninja/leaping/configurate/SimpleConfigurationNode.java
+++ b/configurate-core/src/main/java/ninja/leaping/configurate/SimpleConfigurationNode.java
@@ -204,13 +204,13 @@ public <T> List<T> getList(@NonNull Function<Object, T> transformer, @NonNull Su
     public <T> List<T> getList(@NonNull TypeToken<T> type, List<T> def) throws ObjectMappingException {
         List<T> ret = getValue(new TypeToken<List<T>>() {}
                 .where(new TypeParameter<T>() {}, type), def);
-        return ret.isEmpty() ? storeDefault(def) : ret;
+        return ret == null || ret.isEmpty() ? storeDefault(def) : ret;
     }
 
     @Override
     public <T> List<T> getList(@NonNull TypeToken<T> type, @NonNull Supplier<List<T>> defSupplier) throws ObjectMappingException {
         List<T> ret = getValue(new TypeToken<List<T>>(){}.where(new TypeParameter<T>(){}, type), defSupplier);
-        return ret.isEmpty() ? storeDefault(defSupplier.get()) : ret;
+        return ret == null || ret.isEmpty() ? storeDefault(defSupplier.get()) : ret;
     }
 
     @Override