diff --git a/src/main/java/org/ultramine/mods/scripting/ScriptContainer.java b/src/main/java/org/ultramine/mods/scripting/ScriptContainer.java index 785337e..8340a53 100644 --- a/src/main/java/org/ultramine/mods/scripting/ScriptContainer.java +++ b/src/main/java/org/ultramine/mods/scripting/ScriptContainer.java @@ -123,17 +123,6 @@ { log.debug("[UMS] unloading script {}", scriptId); - for(Closure clsr : unloadHandlers) - { - try { - clsr.call(); - } catch(Throwable t) { - log.error("[UMS:"+ scriptId +"] Failed to invoke unload method", t); - } - } - - unloadHandlers.clear(); - for(IUnregisterable holder : eventHandlers) { try { @@ -164,6 +153,17 @@ } scheduledTasks.clear(); + for(Closure clsr : unloadHandlers) + { + try { + clsr.call(); + } catch(Throwable t) { + log.error("[UMS:"+ scriptId +"] Failed to invoke unload method", t); + } + } + + unloadHandlers.clear(); + loader.onUnload(this); info("script unloaded");