Pass the value type to #storeDefault so the default value can be seri…

…alized (#113)
SpongePowered · Jul 11, 2018 · 80b0ec1 · 80b0ec1
1 parent 4dba3f9
commit 80b0ec1
Showing 1 changed file with 11 additions and 4 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
@@ -119,6 +119,13 @@ private <T> T storeDefault(T defValue) {
         return defValue;
     }
 
+    private <T> T storeDefault(TypeToken<T> type, T defValue) throws ObjectMappingException {
+        if (defValue != null && getOptions().shouldCopyDefaults()) {
+            setValue(type, defValue);
+        }
+        return defValue;
+    }
+
     @Override
     public Object getValue(Object def) {
         Object ret = value.getValue();
@@ -197,15 +204,15 @@ public <T> List<T> getList(@NonNull TypeToken<T> type, @NonNull Supplier<List<T>
     public <T> T getValue(@NonNull TypeToken<T> type, T def) throws ObjectMappingException {
         Object value = getValue();
         if (value == null) {
-            return storeDefault(def);
+            return storeDefault(type, def);
         }
 
         TypeSerializer serial = getOptions().getSerializers().get(type);
         if (serial == null) {
             if (type.getRawType().isInstance(value)) {
                 return (T) type.getRawType().cast(value);
             } else {
-                return storeDefault(def);
+                return storeDefault(type, def);
             }
         }
         return (T) serial.deserialize(type, this);
@@ -216,15 +223,15 @@ public <T> T getValue(@NonNull TypeToken<T> type, T def) throws ObjectMappingExc
     public <T> T getValue(@NonNull TypeToken<T> type, @NonNull Supplier<T> defSupplier) throws ObjectMappingException {
         Object value = getValue();
         if (value == null) {
-            return storeDefault(defSupplier.get());
+            return storeDefault(type, defSupplier.get());
         }
 
         TypeSerializer serial = getOptions().getSerializers().get(type);
         if (serial == null) {
             if (type.getRawType().isInstance(value)) {
                 return (T) type.getRawType().cast(value);
             } else {
-                return storeDefault(defSupplier.get());
+                return storeDefault(type, defSupplier.get());
             }
         }
         return (T) serial.deserialize(type, this);