no longer passing null-values to value-converters

BlvckBytes · Sep 17, 2024 · 4c7323f · 4c7323f
1 parent 5a6f3fa
commit 4c7323f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/me/blvckbytes/bbconfigmapper/ConfigMapper.java b/src/main/java/me/blvckbytes/bbconfigmapper/ConfigMapper.java
@@ -128,13 +128,13 @@ private <T extends IConfigSection> T mapSectionSub(@Nullable String root, @Nulla
 
           Object value = resolveFieldValue(root, source, f, fieldType);
 
-          if (converter != null)
-            value = converter.apply(value, evaluator);
-
           // Couldn't resolve a non-null value, try to ask for a default value
           if (value == null)
             value = instance.defaultFor(f);
 
+          if (value != null && converter != null)
+            value = converter.apply(value, evaluator);
+
           // Only set if the value isn't null, as the default constructor
           // might have already assigned some default value earlier
           if (value == null)