From c2c5187c01c9b5f52b52b8634e3bcab77bde3e6c Mon Sep 17 00:00:00 2001 From: TPGamesNL Date: Sat, 29 Jan 2022 19:12:58 +0100 Subject: [PATCH 1/2] Update ScriptLoader --- src/main/java/ch/njol/skript/ScriptLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ch/njol/skript/ScriptLoader.java b/src/main/java/ch/njol/skript/ScriptLoader.java index b552e7b9531..cd70e51b6aa 100644 --- a/src/main/java/ch/njol/skript/ScriptLoader.java +++ b/src/main/java/ch/njol/skript/ScriptLoader.java @@ -490,7 +490,7 @@ static CompletableFuture loadScripts(OpenCloseable openCloseable) { } if (scriptInfo.files == 0) - Skript.warning(m_no_scripts.toString()); + SkriptLogger.log(new LogEntry(Level.WARNING, m_no_scripts.toString(), null)); if (Skript.logNormal() && scriptInfo.files > 0) Skript.info(m_scripts_loaded.toString( scriptInfo.files, From 818f3f3723a7ec28c23dcaaf617364e4b11741f2 Mon Sep 17 00:00:00 2001 From: TPGamesNL Date: Mon, 31 Jan 2022 12:12:56 +0100 Subject: [PATCH 2/2] Make Variables reset current node instead --- src/main/java/ch/njol/skript/ScriptLoader.java | 2 +- src/main/java/ch/njol/skript/variables/Variables.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/ch/njol/skript/ScriptLoader.java b/src/main/java/ch/njol/skript/ScriptLoader.java index cd70e51b6aa..b552e7b9531 100644 --- a/src/main/java/ch/njol/skript/ScriptLoader.java +++ b/src/main/java/ch/njol/skript/ScriptLoader.java @@ -490,7 +490,7 @@ static CompletableFuture loadScripts(OpenCloseable openCloseable) { } if (scriptInfo.files == 0) - SkriptLogger.log(new LogEntry(Level.WARNING, m_no_scripts.toString(), null)); + Skript.warning(m_no_scripts.toString()); if (Skript.logNormal() && scriptInfo.files > 0) Skript.info(m_scripts_loaded.toString( scriptInfo.files, diff --git a/src/main/java/ch/njol/skript/variables/Variables.java b/src/main/java/ch/njol/skript/variables/Variables.java index 071ac8e9bc5..98067272dc1 100644 --- a/src/main/java/ch/njol/skript/variables/Variables.java +++ b/src/main/java/ch/njol/skript/variables/Variables.java @@ -36,6 +36,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.regex.Pattern; +import ch.njol.skript.log.SkriptLogger; import org.bukkit.Bukkit; import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.configuration.serialization.ConfigurationSerialization; @@ -215,6 +216,8 @@ public void run() { return false; } } finally { + SkriptLogger.setNode(null); + // make sure to put the loaded variables into the variables map final int n = onStoragesLoaded(); if (n != 0) {