Skip to content

Ensure that unload event is called before unloading of functions regardless of order in script. #8250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sovdeeth merged 8 commits into from
Dec 2, 2025
+49 −35
Merged

Ensure that unload event is called before unloading of functions regardless of order in script. #8250

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
da519bd
Ensure that unload event is called before unloading of functions.
TFSMads Oct 22, 2025
cb40b35
Unload based on priority from structure
TFSMads Oct 22, 2025
bba3266
Remove unused import
TFSMads Oct 22, 2025
f024467
Remove debug message
TFSMads Oct 22, 2025
c2fd9f7
Merge branch 'dev/patch' into bug/unload
TFSMads Oct 30, 2025
9257163
Structures now unload based on priority across multiple scripts.
TFSMads Nov 2, 2025
d7e9e70
Merge branch 'dev/patch' into bug/unload
sovdeeth Dec 1, 2025
8744049
Requested Changes
sovdeeth Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 49 additions & 35 deletions src/main/java/ch/njol/skript/ScriptLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -528,18 +523,19 @@ 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()
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()
.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);
Expand All @@ -566,9 +562,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);
Expand All @@ -590,9 +586,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);
Expand Down Expand Up @@ -870,35 +866,53 @@ public static ScriptInfo unloadScripts(Set<Script> scripts) {
}

ParserInstance parser = getParser();

// initial unload stage
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()
.map(structure -> new UnloadingStructure(script, structure));
})
.sorted(unloadComparator)
.collect(Collectors.toCollection(ArrayList::new));

// trigger unload event before unloading scripts
for (Script script : scripts) {
parser.setActive(script);

// trigger unload event before beginning
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));
}

// initial unload stage
for (UnloadingStructure unloadingStructure : unloadingStructures) {
Script script = unloadingStructure.script();
Structure structure = unloadingStructure.structure();

for (Structure structure : script.getStructures())
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 = script.getStructures();
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();
parser.setInactive();
structure.postUnload();
}
parser.setInactive();

// finish unloading of scripts + data collection
for (Script script : scripts) {
info.files++;

script.clearData();
script.invalidate();
Expand Down