Fix nullability not being allowed for collections in PersistenceLoader

CitizensDev · May 13, 2023 · f8004ec · f8004ec
1 parent 91b5964
commit f8004ec
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/main/java/net/citizensnpcs/api/persistence/PersistenceLoader.java b/src/main/java/net/citizensnpcs/api/persistence/PersistenceLoader.java
@@ -166,6 +166,9 @@ private static void deserialise(PersistField field, Object instance, Object oldV
         // TODO: this is pretty ugly.
         if (!Collection.class.isAssignableFrom(collectionType) && !Map.class.isAssignableFrom(collectionType))
             throw loadException;
+        if (Collection.class.isAssignableFrom(type) && !root.keyExists(field.key))
+            return;
+
         if (List.class.isAssignableFrom(type)) {
             List<Object> list = (List<Object>) (!List.class.isAssignableFrom(collectionType) ? Lists.newArrayList()
                     : collectionType.newInstance());

diff --git a/src/test/java/net/citizensnpcs/api/persistence/PersistenceLoaderTest.java b/src/test/java/net/citizensnpcs/api/persistence/PersistenceLoaderTest.java
@@ -65,6 +65,12 @@ public void loadsCollections() {
         }
     }
 
+    @Test
+    public void loadsNullSets() {
+        SpecificCollectionClassTest test = PersistenceLoader.load(SpecificCollectionClassTest.class, root);
+        assertEquals(test.list, null);
+    }
+
     @Test
     public void longLoadSaveTest() {
         LongLoadSaveTest load = new LongLoadSaveTest();