mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-16 07:14:46 +00:00
Fix Scripting Config Syncing Issues & Fixed Auction Tooltip Rendering Bugs
This commit is contained in:
1 parent
449a10711e
commit
83b86a4538
22 files changed
+353
-202
No files matched your search
@@ -3,6 +3,7 @@ package noppes.npcs.controllers;
|
||||
import cpw.mods.fml.common.eventhandler.Event;
|
||||
import jdk.nashorn.api.scripting.ScriptObjectMirror;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import noppes.npcs.CustomNpcs;
|
||||
import noppes.npcs.NBTTags;
|
||||
import noppes.npcs.config.ConfigScript;
|
||||
import noppes.npcs.constants.EnumScriptType;
|
||||
@@ -104,7 +105,7 @@ public class ScriptContainer implements IScriptUnit {
|
||||
if (!this.evaluated) {
|
||||
// build includes first depending on config setting
|
||||
StringBuilder sb = new StringBuilder();
|
||||
if (ConfigScript.RunLoadedScriptsFirst) {
|
||||
if (CustomNpcs.proxy.isRunLoadedScriptsFirst()) {
|
||||
this.appendExternalScripts(sb);
|
||||
}
|
||||
|
||||
@@ -114,7 +115,7 @@ public class ScriptContainer implements IScriptUnit {
|
||||
}
|
||||
|
||||
// build includes last if not built first
|
||||
if (!ConfigScript.RunLoadedScriptsFirst) {
|
||||
if (!CustomNpcs.proxy.isRunLoadedScriptsFirst()) {
|
||||
this.appendExternalScripts(sb);
|
||||
}
|
||||
this.fullscript = sb.toString();
|
||||
@@ -158,14 +159,14 @@ public class ScriptContainer implements IScriptUnit {
|
||||
}
|
||||
|
||||
public void run(EnumScriptType type, Event event) {
|
||||
if (!ConfigScript.ScriptingEnabled)
|
||||
if (!CustomNpcs.proxy.isScriptingEnabled())
|
||||
return;
|
||||
|
||||
this.run((String) type.function, (Object) event);
|
||||
}
|
||||
|
||||
public void run(String type, Object event) {
|
||||
if (!ConfigScript.ScriptingEnabled || errored || !hasCode() || unknownFunctions.contains(type))
|
||||
if (!CustomNpcs.proxy.isScriptingEnabled() || errored || !hasCode() || unknownFunctions.contains(type))
|
||||
return;
|
||||
|
||||
this.setEngine(handler.getLanguage());
|
||||
|
||||
Reference in new issue
Block a user