From da519bd2903f91b11cb5f882806df7623021a8b1 Mon Sep 17 00:00:00 2001
From: Mads Volder <madsvolder@gmail.com>
Date: Wed, 22 Oct 2025 06:59:57 -0800
Subject: [PATCH 1/6] Ensure that unload event is called before unloading of
 functions.

---
 src/main/java/ch/njol/skript/ScriptLoader.java     | 12 ++++++++++--
 src/main/java/ch/njol/skript/lang/SkriptEvent.java |  7 +++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ch/njol/skript/ScriptLoader.java b/src/main/java/ch/njol/skript/ScriptLoader.java
index 333d907e306..c9f8320f5ba 100644
--- a/src/main/java/ch/njol/skript/ScriptLoader.java
+++ b/src/main/java/ch/njol/skript/ScriptLoader.java
@@ -15,6 +15,7 @@
 import ch.njol.skript.log.LogEntry;
 import ch.njol.skript.log.RetainingLogHandler;
 import ch.njol.skript.log.SkriptLogger;
+import ch.njol.skript.structures.StructEvent;
 import ch.njol.skript.structures.StructOptions.OptionsData;
 import ch.njol.skript.test.runner.TestMode;
 import ch.njol.skript.util.ExceptionUtils;
@@ -43,6 +44,7 @@
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -870,6 +872,8 @@ public static ScriptInfo unloadScripts(Set<Script> scripts) {
 		}
 
 		ParserInstance parser = getParser();
+		Comparator<Structure> unloadComparator = Comparator.comparing(struct-> !(struct instanceof StructEvent structEvent
+			&& structEvent.getSkriptEvent().getEventId().equals("script_loadunload")));
 
 		// initial unload stage
 		for (Script script : scripts) {
@@ -881,7 +885,10 @@ public static ScriptInfo unloadScripts(Set<Script> scripts) {
 			script.eventRegistry().events(ScriptUnloadEvent.class)
 					.forEach(event -> event.onUnload(parser, script));
 
-			for (Structure structure : script.getStructures())
+			List<Structure> structures = new ArrayList<>(script.getStructures());
+			structures.sort(unloadComparator);
+
+			for (Structure structure : structures)
 				structure.unload();
 		}
 
@@ -890,7 +897,8 @@ public static ScriptInfo unloadScripts(Set<Script> scripts) {
 		// finish unloading + data collection
 		ScriptInfo info = new ScriptInfo();
 		for (Script script : scripts) {
-			List<Structure> structures = script.getStructures();
+			List<Structure> structures = new ArrayList<>(script.getStructures());
+			structures.sort(unloadComparator);
 
 			info.files++;
 			info.structures += structures.size();
diff --git a/src/main/java/ch/njol/skript/lang/SkriptEvent.java b/src/main/java/ch/njol/skript/lang/SkriptEvent.java
index c328765754b..1ce57483aff 100644
--- a/src/main/java/ch/njol/skript/lang/SkriptEvent.java
+++ b/src/main/java/ch/njol/skript/lang/SkriptEvent.java
@@ -201,6 +201,13 @@ public Class<? extends Event>[] getEventClasses() {
 		return skriptEventInfo.events;
 	}
 
+	/**
+	 * @return the id of the event
+	 */
+	public String getEventId() {
+		return skriptEventInfo.getId();
+	}
+
 	/**
 	 * @return the {@link EventPriority} to be used for this event.
 	 * Defined by the user-specified priority, or otherwise the default event priority.

From cb40b35ddcd6e87fe0d52e3d1d03fcfceadeedd6 Mon Sep 17 00:00:00 2001
From: Mads Volder <madsvolder@gmail.com>
Date: Wed, 22 Oct 2025 09:20:32 -0800
Subject: [PATCH 2/6] Unload based on priority from structure

---
 src/main/java/ch/njol/skript/ScriptLoader.java     | 8 +++++---
 src/main/java/ch/njol/skript/lang/SkriptEvent.java | 7 -------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/main/java/ch/njol/skript/ScriptLoader.java b/src/main/java/ch/njol/skript/ScriptLoader.java
index c9f8320f5ba..97763aaec3c 100644
--- a/src/main/java/ch/njol/skript/ScriptLoader.java
+++ b/src/main/java/ch/njol/skript/ScriptLoader.java
@@ -872,8 +872,8 @@ public static ScriptInfo unloadScripts(Set<Script> scripts) {
 		}
 
 		ParserInstance parser = getParser();
-		Comparator<Structure> unloadComparator = Comparator.comparing(struct-> !(struct instanceof StructEvent structEvent
-			&& structEvent.getSkriptEvent().getEventId().equals("script_loadunload")));
+		Comparator<Structure> unloadComparator = Comparator.comparing(struct -> struct.getPriority().getPriority());
+		unloadComparator = unloadComparator.reversed();
 
 		// initial unload stage
 		for (Script script : scripts) {
@@ -888,8 +888,10 @@ public static ScriptInfo unloadScripts(Set<Script> scripts) {
 			List<Structure> structures = new ArrayList<>(script.getStructures());
 			structures.sort(unloadComparator);
 
-			for (Structure structure : structures)
+			for (Structure structure : structures) {
+				Skript.adminBroadcast(structure.toString() + " - " + structure.getPriority().getPriority());
 				structure.unload();
+			}
 		}
 
 		parser.setInactive();
diff --git a/src/main/java/ch/njol/skript/lang/SkriptEvent.java b/src/main/java/ch/njol/skript/lang/SkriptEvent.java
index 1ce57483aff..c328765754b 100644
--- a/src/main/java/ch/njol/skript/lang/SkriptEvent.java
+++ b/src/main/java/ch/njol/skript/lang/SkriptEvent.java
@@ -201,13 +201,6 @@ public Class<? extends Event>[] getEventClasses() {
 		return skriptEventInfo.events;
 	}
 
-	/**
-	 * @return the id of the event
-	 */
-	public String getEventId() {
-		return skriptEventInfo.getId();
-	}
-
 	/**
 	 * @return the {@link EventPriority} to be used for this event.
 	 * Defined by the user-specified priority, or otherwise the default event priority.

From bba32667f92b1c61a9f2c16bb927a907ded2c219 Mon Sep 17 00:00:00 2001
From: Mads Volder <madsvolder@gmail.com>
Date: Wed, 22 Oct 2025 09:22:31 -0800
Subject: [PATCH 3/6] Remove unused import

---
 src/main/java/ch/njol/skript/ScriptLoader.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/ch/njol/skript/ScriptLoader.java b/src/main/java/ch/njol/skript/ScriptLoader.java
index 97763aaec3c..93c7e2eb092 100644
--- a/src/main/java/ch/njol/skript/ScriptLoader.java
+++ b/src/main/java/ch/njol/skript/ScriptLoader.java
@@ -15,7 +15,6 @@
 import ch.njol.skript.log.LogEntry;
 import ch.njol.skript.log.RetainingLogHandler;
 import ch.njol.skript.log.SkriptLogger;
-import ch.njol.skript.structures.StructEvent;
 import ch.njol.skript.structures.StructOptions.OptionsData;
 import ch.njol.skript.test.runner.TestMode;
 import ch.njol.skript.util.ExceptionUtils;
@@ -44,7 +43,6 @@
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

From f02446719b1b056ad8f6068b883e48d285e11e46 Mon Sep 17 00:00:00 2001
From: Mads Volder <madsvolder@gmail.com>
Date: Wed, 22 Oct 2025 09:24:03 -0800
Subject: [PATCH 4/6] Remove debug message

---
 src/main/java/ch/njol/skript/ScriptLoader.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/ch/njol/skript/ScriptLoader.java b/src/main/java/ch/njol/skript/ScriptLoader.java
index 93c7e2eb092..0fa0e41c840 100644
--- a/src/main/java/ch/njol/skript/ScriptLoader.java
+++ b/src/main/java/ch/njol/skript/ScriptLoader.java
@@ -887,7 +887,6 @@ public static ScriptInfo unloadScripts(Set<Script> scripts) {
 			structures.sort(unloadComparator);
 
 			for (Structure structure : structures) {
-				Skript.adminBroadcast(structure.toString() + " - " + structure.getPriority().getPriority());
 				structure.unload();
 			}
 		}

From 9257163d055c7df09c2d6f5d9d2604b13226ecb4 Mon Sep 17 00:00:00 2001
From: Mads Volder <madsvolder@gmail.com>
Date: Sun, 2 Nov 2025 15:05:07 +0100
Subject: [PATCH 5/6] Structures now unload based on priority across multiple
 scripts.

---
 .../java/ch/njol/skript/ScriptLoader.java     | 80 +++++++++++--------
 1 file changed, 48 insertions(+), 32 deletions(-)

diff --git a/src/main/java/ch/njol/skript/ScriptLoader.java b/src/main/java/ch/njol/skript/ScriptLoader.java
index 0fa0e41c840..2b7e862a674 100644
--- a/src/main/java/ch/njol/skript/ScriptLoader.java
+++ b/src/main/java/ch/njol/skript/ScriptLoader.java
@@ -528,18 +528,18 @@ private static CompletableFuture<ScriptInfo> loadScripts(List<Config> configs, O
 
 					// build sorted list
 					// this nest of pairs is terrible, but we need to keep the reference to the modifiable structures list
-					List<NonNullPair<LoadingScriptInfo, Structure>> pairs = scripts.stream()
+					List<LoadingStructure> loadingStructures = scripts.stream()
 							.flatMap(info -> { // Flatten each entry down to a stream of Script-Structure pairs
 								return info.structures.stream()
-										.map(structure -> new NonNullPair<>(info, structure));
+										.map(structure -> new LoadingStructure(info, structure));
 							})
-							.sorted(Comparator.comparing(pair -> pair.getSecond().getPriority()))
+							.sorted(Comparator.comparing(pair -> pair.structure().getPriority()))
 							.collect(Collectors.toCollection(ArrayList::new));
 
 					// pre-loading
-					pairs.removeIf(pair -> {
-						LoadingScriptInfo loadingInfo = pair.getFirst();
-						Structure structure = pair.getSecond();
+					loadingStructures.removeIf(loadingStructure -> {
+						LoadingScriptInfo loadingInfo = loadingStructure.loadingScriptInfo();
+						Structure structure = loadingStructure.structure();
 
 						parser.setActive(loadingInfo.script);
 						parser.setCurrentStructure(structure);
@@ -566,9 +566,9 @@ private static CompletableFuture<ScriptInfo> loadScripts(List<Config> configs, O
 					// Until these reworks happen, limiting main loading to asynchronous (not parallel) is the only choice we have.
 
 					// loading
-					pairs.removeIf(pair -> {
-						LoadingScriptInfo loadingInfo = pair.getFirst();
-						Structure structure = pair.getSecond();
+					loadingStructures.removeIf(loadingStructure -> {
+						LoadingScriptInfo loadingInfo = loadingStructure.loadingScriptInfo();
+						Structure structure = loadingStructure.structure();
 
 						parser.setActive(loadingInfo.script);
 						parser.setCurrentStructure(structure);
@@ -590,9 +590,9 @@ private static CompletableFuture<ScriptInfo> loadScripts(List<Config> configs, O
 					parser.setInactive();
 
 					// post-loading
-					pairs.removeIf(pair -> {
-						LoadingScriptInfo loadingInfo = pair.getFirst();
-						Structure structure = pair.getSecond();
+					loadingStructures.removeIf(loadingStructure -> {
+						LoadingScriptInfo loadingInfo = loadingStructure.loadingScriptInfo();
+						Structure structure = loadingStructure.structure();
 
 						parser.setActive(loadingInfo.script);
 						parser.setCurrentStructure(structure);
@@ -657,6 +657,8 @@ public LoadingScriptInfo(Script script, List<Structure> structures, Map<Structur
 
 	}
 
+	public record LoadingStructure (LoadingScriptInfo loadingScriptInfo, Structure structure) {}
+
 	/**
 	 * Creates a script and loads the provided config into it.
 	 * @param config The config to load into a script.
@@ -854,6 +856,8 @@ private static Config loadStructure(InputStream source, String name) {
 	 * Script Unloading Methods
 	 */
 
+	public record UnloadingStructure (Script script, Structure structure) {}
+
 	/**
 	 * Unloads all scripts present in the provided collection.
 	 * @param scripts The scripts to unload.
@@ -870,42 +874,54 @@ public static ScriptInfo unloadScripts(Set<Script> scripts) {
 		}
 
 		ParserInstance parser = getParser();
-		Comparator<Structure> unloadComparator = Comparator.comparing(struct -> struct.getPriority().getPriority());
+		Comparator<UnloadingStructure> unloadComparator = Comparator.comparing(unloadingStructure -> unloadingStructure.structure().getPriority());
 		unloadComparator = unloadComparator.reversed();
 
-		// initial unload stage
-		for (Script script : scripts) {
-			parser.setActive(script);
 
-			// trigger unload event before beginning
+
+		List<UnloadingStructure> unloadingStructures = scripts.stream()
+			.flatMap(script -> { // Flatten each entry down to a stream of Script-Structure pairs
+				return script.getStructures().stream()
+					.map(structure -> new UnloadingStructure(script, structure));
+			})
+			.sorted(unloadComparator)
+			.collect(Collectors.toCollection(ArrayList::new));
+
+		// trigger unload event before unloading scripts
+		for (Script script : scripts) {
 			eventRegistry().events(ScriptUnloadEvent.class)
-					.forEach(event -> event.onUnload(parser, script));
+				.forEach(event -> event.onUnload(parser, script));
 			script.eventRegistry().events(ScriptUnloadEvent.class)
-					.forEach(event -> event.onUnload(parser, script));
+				.forEach(event -> event.onUnload(parser, script));
+		}
 
-			List<Structure> structures = new ArrayList<>(script.getStructures());
-			structures.sort(unloadComparator);
+		// initial unload stage
+		for (UnloadingStructure unloadingStructure : unloadingStructures) {
+			Script script = unloadingStructure.script();
+			Structure structure = unloadingStructure.structure();
 
-			for (Structure structure : structures) {
-				structure.unload();
-			}
+			parser.setActive(script);
+			structure.unload();
 		}
 
 		parser.setInactive();
 
-		// finish unloading + data collection
+		// finish unloading of structures + data collection
 		ScriptInfo info = new ScriptInfo();
-		for (Script script : scripts) {
-			List<Structure> structures = new ArrayList<>(script.getStructures());
-			structures.sort(unloadComparator);
+		for (UnloadingStructure unloadingStructure : unloadingStructures) {
+			Script script = unloadingStructure.script();
+			Structure structure = unloadingStructure.structure();
 
-			info.files++;
-			info.structures += structures.size();
+			info.structures++;
 
 			parser.setActive(script);
-			for (Structure structure : structures)
-				structure.postUnload();
+			structure.postUnload();
 			parser.setInactive();
+		}
+
+		// finish unloading of scripts + data collection
+		for (Script script : scripts) {
+			info.files++;
 
 			script.clearData();
 			script.invalidate();

From 8744049e0728742342f44acdff770beeba764136 Mon Sep 17 00:00:00 2001
From: sovdee <10354869+sovdeeth@users.noreply.github.com>
Date: Mon, 1 Dec 2025 15:53:12 -0800
Subject: [PATCH 6/6] Requested Changes

---
 src/main/java/ch/njol/skript/ScriptLoader.java | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/main/java/ch/njol/skript/ScriptLoader.java b/src/main/java/ch/njol/skript/ScriptLoader.java
index 2b7e862a674..8925bd2cf62 100644
--- a/src/main/java/ch/njol/skript/ScriptLoader.java
+++ b/src/main/java/ch/njol/skript/ScriptLoader.java
@@ -5,11 +5,7 @@
 import ch.njol.skript.config.SectionNode;
 import ch.njol.skript.config.SimpleNode;
 import ch.njol.skript.events.bukkit.PreScriptLoadEvent;
-import ch.njol.skript.lang.ExecutionIntent;
-import ch.njol.skript.lang.Section;
-import ch.njol.skript.lang.SkriptParser;
-import ch.njol.skript.lang.Statement;
-import ch.njol.skript.lang.TriggerItem;
+import ch.njol.skript.lang.*;
 import ch.njol.skript.lang.parser.ParserInstance;
 import ch.njol.skript.log.CountingLogHandler;
 import ch.njol.skript.log.LogEntry;
@@ -22,7 +18,6 @@
 import ch.njol.skript.util.Task;
 import ch.njol.skript.util.Timespan;
 import ch.njol.skript.variables.HintManager;
-import ch.njol.util.NonNullPair;
 import ch.njol.util.OpenCloseable;
 import ch.njol.util.StringUtils;
 import org.bukkit.Bukkit;
@@ -528,6 +523,7 @@ private static CompletableFuture<ScriptInfo> loadScripts(List<Config> configs, O
 
 					// build sorted list
 					// this nest of pairs is terrible, but we need to keep the reference to the modifiable structures list
+					record LoadingStructure (LoadingScriptInfo loadingScriptInfo, Structure structure) {}
 					List<LoadingStructure> loadingStructures = scripts.stream()
 							.flatMap(info -> { // Flatten each entry down to a stream of Script-Structure pairs
 								return info.structures.stream()
@@ -657,8 +653,6 @@ public LoadingScriptInfo(Script script, List<Structure> structures, Map<Structur
 
 	}
 
-	public record LoadingStructure (LoadingScriptInfo loadingScriptInfo, Structure structure) {}
-
 	/**
 	 * Creates a script and loads the provided config into it.
 	 * @param config The config to load into a script.
@@ -856,8 +850,6 @@ private static Config loadStructure(InputStream source, String name) {
 	 * Script Unloading Methods
 	 */
 
-	public record UnloadingStructure (Script script, Structure structure) {}
-
 	/**
 	 * Unloads all scripts present in the provided collection.
 	 * @param scripts The scripts to unload.
@@ -874,11 +866,10 @@ public static ScriptInfo unloadScripts(Set<Script> scripts) {
 		}
 
 		ParserInstance parser = getParser();
+		record UnloadingStructure (Script script, Structure structure) {}
 		Comparator<UnloadingStructure> unloadComparator = Comparator.comparing(unloadingStructure -> unloadingStructure.structure().getPriority());
 		unloadComparator = unloadComparator.reversed();
 
-
-
 		List<UnloadingStructure> unloadingStructures = scripts.stream()
 			.flatMap(script -> { // Flatten each entry down to a stream of Script-Structure pairs
 				return script.getStructures().stream()
@@ -916,8 +907,8 @@ public static ScriptInfo unloadScripts(Set<Script> scripts) {
 
 			parser.setActive(script);
 			structure.postUnload();
-			parser.setInactive();
 		}
+		parser.setInactive();
 
 		// finish unloading of scripts + data collection
 		for (Script script : scripts) {