From a9bfa6c1209b5b5b12ae53559b04f3770e843928 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 15 Dec 2025 20:05:40 +0200 Subject: [PATCH] ScriptController.globalRevision, Incremented whenever external scripts loaded. --- .../network/packets/request/script/ScriptFilesPacket.java | 3 +++ .../java/noppes/npcs/controllers/ScriptController.java | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/ScriptFilesPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/ScriptFilesPacket.java index f64550b65..74bf8bd5e 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/ScriptFilesPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/ScriptFilesPacket.java @@ -67,8 +67,10 @@ public final class ScriptFilesPacket extends AbstractPacket { cont.scripts.put(script.getKey(), script.getValue()); } + //Set client side configs ConfigScript.ScriptingEnabled = compound.getBoolean("ScriptingEnabled"); ConfigScript.RunLoadedScriptsFirst = compound.getBoolean("LoadedFirst"); + ScriptController.Instance.globalRevision = compound.getInteger("GlobalRevision"); } public NBTTagCompound getScriptsNbt(String lang) { @@ -88,6 +90,7 @@ public final class ScriptFilesPacket extends AbstractPacket { //Send server configs to client compound.setBoolean("ScriptingEnabled", ConfigScript.ScriptingEnabled); compound.setBoolean("LoadedFirst", ConfigScript.RunLoadedScriptsFirst); + compound.setInteger("GlobalRevision", ScriptController.Instance.globalRevision); compound.setTag("Scripts", NBTTags.nbtStringStringMap(scriptss)); return compound; } diff --git a/src/main/java/noppes/npcs/controllers/ScriptController.java b/src/main/java/noppes/npcs/controllers/ScriptController.java index b0787a282..b5d21563c 100644 --- a/src/main/java/noppes/npcs/controllers/ScriptController.java +++ b/src/main/java/noppes/npcs/controllers/ScriptController.java @@ -64,6 +64,12 @@ public class ScriptController { public GlobalNPCDataScript globalNpcScripts = new GlobalNPCDataScript((EntityNPCInterface) null); public long lastGlobalNpcUpdate = 0L; + /** + * Incremented whenever external scripts loaded. + */ + public int globalRevision; + + public ScriptController() { Instance = this; manager = new ScriptEngineManager(); @@ -257,6 +263,7 @@ public class ScriptController { loadDir(scriptDir, "", ext); } lastLoaded = System.currentTimeMillis(); + globalRevision++; } private void loadDir(File dir, String name, String ext) {