core: Be more defensive about getting null lists

SpongePowered · Nov 5, 2020 · 7a8fae6 · 7a8fae6
1 parent af998ae
commit 7a8fae6
Showing 1 changed file with 2 additions and 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
@@ -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