Use callSync

Author: TheLimeGlass

src/main/java/ch/njol/skript/ScriptLoader.java

@@ -38,6 +38,7 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.sql.Struct;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.Supplier;
@@ -846,8 +847,11 @@ public static ScriptInfo unloadScripts(Set<Script> scripts) {
 			script.eventRegistry().events(ScriptUnloadEvent.class)
 					.forEach(event -> event.onUnload(parser, script));
 
-			for (Structure structure : script.getStructures())
-				structure.unload();
+			Stream<Structure> structuresStream = script.getStructures().stream();
+			if (isParallel())
+				structuresStream = structuresStream.parallel();
+
+			structuresStream.forEachOrdered(Structure::unload);
 		}
 
 		parser.setInactive();

src/main/java/ch/njol/skript/command/ScriptCommand.java

@@ -460,27 +460,24 @@ public void registerHelp() {
 	}
 
 	public void unregisterHelp() {
-		new Task(Skript.getInstance(), 0) {
-			@Override
-			public void run() {
-				Bukkit.getHelpMap().getHelpTopics().removeAll(helps);
-
-				final HelpTopic aliases = Bukkit.getHelpMap().getHelpTopic("Aliases");
-				if (aliases != null && aliases instanceof IndexHelpTopic) {
-					try {
-						final Field topics = IndexHelpTopic.class.getDeclaredField("allTopics");
-						topics.setAccessible(true);
-						@SuppressWarnings("unchecked")
-						final ArrayList<HelpTopic> as = new ArrayList<>((Collection<HelpTopic>) topics.get(aliases));
-						as.removeAll(helps);
-						topics.set(aliases, as);
-					} catch (final Exception e) {
-						Skript.outdatedError(e);//, "error unregistering aliases for /" + getName());
-					}
+		Task.callSync(() -> {
+			Bukkit.getHelpMap().getHelpTopics().removeAll(helps);
+			final HelpTopic aliases = Bukkit.getHelpMap().getHelpTopic("Aliases");
+			if (aliases != null && aliases instanceof IndexHelpTopic) {
+				try {
+					final Field topics = IndexHelpTopic.class.getDeclaredField("allTopics");
+					topics.setAccessible(true);
+					@SuppressWarnings("unchecked")
+					final ArrayList<HelpTopic> as = new ArrayList<>((Collection<HelpTopic>) topics.get(aliases));
+					as.removeAll(helps);
+					topics.set(aliases, as);
+				} catch (final Exception e) {
+					Skript.outdatedError(e);//, "error unregistering aliases for /" + getName());
 				}
-				helps.clear();
 			}
-		};
+			helps.clear();
+			return null;
+		});
 	}
 
 	public String getName() {