upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-13 06:37:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix Timer not being able to be called from a Spawning NPC [Revert if not working]"

Browse Source 
This reverts commit d1b32ea8a1.
This commit is contained in:
Kam committed 2026-03-04 17:28:18 -05:00
1 parent bed959c658
commit cf49d9a778
1 file changed
+12 -11
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/noppes/npcs/controllers/ScriptContainer.java
+12 -11
View File
@@ -14,7 +14,6 @@ import noppes.npcs.scripted.NpcAPI;
import javax.script.Bindings;
import javax.script.Compilable;
import javax.script.CompiledScript;
import javax.script.Invocable;
import javax.script.ScriptContext;
import javax.script.ScriptEngine;
import java.io.PrintWriter;
@@ -273,18 +272,20 @@ public class ScriptContainer implements IScriptUnit {
unknownFunctions.add(type);
}
} else {
if (instanceBindings != null) {
if (!this.cachedFunctions.containsKey(type)) {
if (!this.cachedFunctions.containsKey(type)) {
ScriptObjectMirror func;
if (instanceBindings != null) {
Object val = instanceBindings.get(type);
ScriptObjectMirror func = val instanceof ScriptObjectMirror ? (ScriptObjectMirror) val : null;
this.cachedFunctions.put(type, func);
func = val instanceof ScriptObjectMirror ? (ScriptObjectMirror) val : null;
} else {
ScriptObjectMirror global = (ScriptObjectMirror) engine.getBindings(ScriptContext.ENGINE_SCOPE);
func = (ScriptObjectMirror) global.get(type);
}
ScriptObjectMirror func = this.cachedFunctions.get(type);
if (func != null) {
func.call(null, event);
}
} else {
((Invocable) engine).invokeFunction(type, event);
this.cachedFunctions.put(type, func);
}
ScriptObjectMirror func = this.cachedFunctions.get(type);
if (func != null) {
func.call(null, event);
}
}
} catch (NoSuchMethodException e) {