Merge pull request #15 from SkriptDev/dev/patch

Dev/patch

Author: ShaneBeee

src/main/java/io/github/syst3ms/skriptparser/expressions/ExprContextValue.java

@@ -83,8 +83,9 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, ParseContex
                     }
                     return false;
                 } else if (state != info.getState()) {
-                    logger.error("The time state of this context value (" + state.toString().toLowerCase() + ") is incorrect", ErrorType.SEMANTIC_ERROR);
-                    return false;
+                    // TODO might find a way to re-implement this later
+                    //logger.error("The time state of this context value (" + state.toString().toLowerCase() + ") is incorrect", ErrorType.SEMANTIC_ERROR);
+                    continue;
                 } else if (parserState.isRestrictingExpressions() && parserState.forbidsSyntax(ExprContextValue.class)) {
                     logger.setContext(ErrorContext.RESTRICTED_SYNTAXES);
                     logger.error("The enclosing section does not allow the use of context expressions.", ErrorType.SEMANTIC_ERROR);

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/VariableStorage.java

@@ -300,7 +300,7 @@ boolean accept(@Nullable String variableName) {
     public <T> SerializedVariable serialize(String name, @Nullable T value) {
         if (value == null)
             return new SerializedVariable(name, null);
-        Type<T> type = (Type<T>) TypeManager.getByClassExact(value.getClass()).orElse(null);
+        Type<T> type = (Type<T>) TypeManager.getByClass(value.getClass()).orElse(null);
         if (type == null) return null;
         //throw new UnsupportedOperationException("Class '" + value.getClass().getName() + "' cannot be serialized. No type registered.");
         TypeSerializer<T> serializer = type.getSerializer().orElse(null);

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) {