Enforce main thread when changing variables during structure loading (#7964)

Author: sovdeeth

src/main/java/ch/njol/skript/structures/StructVariables.java

@@ -1,26 +1,5 @@
 package ch.njol.skript.structures;
 
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import com.google.common.collect.Queues;
-import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.Unmodifiable;
-import org.skriptlang.skript.lang.converter.Converters;
-import org.skriptlang.skript.lang.entry.EntryContainer;
-import org.skriptlang.skript.lang.script.Script;
-import org.skriptlang.skript.lang.script.ScriptData;
-import org.skriptlang.skript.lang.structure.Structure;
-
-import com.google.common.collect.ImmutableList;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.classes.ClassInfo;
 import ch.njol.skript.config.EntryNode;
@@ -37,10 +16,23 @@
 import ch.njol.skript.log.ParseLogHandler;
 import ch.njol.skript.log.SkriptLogger;
 import ch.njol.skript.registrations.Classes;
+import ch.njol.skript.util.Task;
 import ch.njol.skript.variables.Variables;
 import ch.njol.util.NonNullPair;
 import ch.njol.util.StringUtils;
 import ch.njol.util.coll.CollectionUtils;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Queues;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Unmodifiable;
+import org.skriptlang.skript.lang.converter.Converters;
+import org.skriptlang.skript.lang.entry.EntryContainer;
+import org.skriptlang.skript.lang.script.Script;
+import org.skriptlang.skript.lang.script.ScriptData;
+import org.skriptlang.skript.lang.structure.Structure;
+
+import java.util.*;
 
 @Name("Variables")
 @Description({
@@ -245,12 +237,15 @@ public boolean load() {
 		} else if (data.isLoaded()) {
 			return true;
 		}
-		for (NonNullPair<String, Object> pair : data.getVariables()) {
-			String name = pair.getKey();
-			if (Variables.getVariable(name, null, false) != null)
-				continue;
-			Variables.setVariable(name, pair.getValue(), null, false);
-		}
+		Task.callSync(() -> {
+			for (NonNullPair<String, Object> pair : data.getVariables()) {
+				String name = pair.getKey();
+				if (Variables.getVariable(name, null, false) != null)
+					continue;
+				Variables.setVariable(name, pair.getValue(), null, false);
+			}
+			return null;
+		});
 		data.loaded = true;
 		return true;
 	}

src/main/java/ch/njol/skript/test/runner/StructParse.java

@@ -12,11 +12,11 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.lang.parser.ParserInstance;
 import ch.njol.skript.lang.util.ContextlessEvent;
 import ch.njol.skript.log.LogEntry;
 import ch.njol.skript.log.RetainingLogHandler;
 import ch.njol.skript.log.SkriptLogger;
+import ch.njol.skript.util.Task;
 import com.google.common.collect.Iterables;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
@@ -78,7 +78,10 @@ public boolean init(Literal<?>[] args, int matchedPattern,
 
 	@Override
 	public boolean postLoad() {
-		resultsExpression.change(ContextlessEvent.get(), logs, ChangeMode.SET);
+		Task.callSync(() -> {
+			resultsExpression.change(ContextlessEvent.get(), logs, ChangeMode.SET);
+			return null;
+		});
 		return true;
 	}