Variables - fix variables not having a final saving

Author: ShaneBeee

src/main/java/io/github/syst3ms/skriptparser/variables/VariableMap.java

@@ -18,6 +18,10 @@ public class VariableMap {
 
     private final Map<String, Object> map = new HashMap<>(); // Ordering is not important right now
 
+    public Map<String, Object> getMap() {
+        return this.map;
+    }
+
     private static String[] splitList(String name) {
         return Pattern.compile(Pattern.quote(Variables.LIST_SEPARATOR)).split(name);
     }

src/main/java/io/github/syst3ms/skriptparser/variables/Variables.java

@@ -56,6 +56,24 @@ public static ReentrantLock getLock() {
 
     public static void shutdown() {
         for (VariableStorage storage : STORAGES) {
+            // Write all variables to their storages
+            // This needs to be done on shutdown to make sure changes to an object
+            // are properly serialized and saved after their initial save
+            variableMap.getMap().forEach((key, object) -> {
+                if (!storage.accept(key)) return;
+
+                SerializedVariable serialized = storage.serialize(key, object);
+                if (serialized != null) {
+                    SerializedVariable.Value value = serialized.value();
+                    if (value == null) {
+                        storage.save(key, null, null);
+                    } else {
+                        storage.save(key, value.type(), value.data());
+                    }
+                }
+
+            });
+            // Close storage
             try {
                 storage.close();
             } catch (IOException e) {