Container event spam when no container is open fixed. Fixed scripted player and forge events not launching after merging ScriptContainer and EventScriptContainer.

This commit is contained in:
luisc committed 2021-12-03 18:17:52 -06:00
1 parent 23686dc3b8
commit 547f5ab82d
4 files changed
+41 -65

No files matched your search

@@ -78,50 +78,71 @@ public class PlayerDataScript implements IScriptHandler {
}
public void callScript(EnumScriptType type, Event event, Object... obs) {
if (this.isEnabled()) {
if(this.isEnabled()) {
ScriptContainer script;
if (ScriptController.Instance.lastLoaded > this.lastInited || ScriptController.Instance.lastPlayerUpdate > this.lastPlayerUpdate) {
if(ScriptController.Instance.lastLoaded > this.lastInited || ScriptController.Instance.lastPlayerUpdate > this.lastPlayerUpdate) {
this.lastInited = ScriptController.Instance.lastLoaded;
errored.clear();
if (this.player != null) {
//ScriptController.Instance.playerScripts.errored.clear();
if(this.player != null) {
this.scripts.clear();
Iterator var3 = ScriptController.Instance.playerScripts.scripts.iterator();
Iterator i = ScriptController.Instance.playerScripts.scripts.iterator();
while(var3.hasNext()) {
script = (ScriptContainer)var3.next();
while(i.hasNext()) {
script = (ScriptContainer)i.next();
ScriptContainer s = new ScriptContainer(this);
s.readFromNBT(script.writeToNBT(new NBTTagCompound()));
this.scripts.add(s);
}
}
this.lastPlayerUpdate = ScriptController.Instance.lastPlayerUpdate;
if (type != EnumScriptType.INIT) {
if(type != EnumScriptType.INIT) {
EventHooks.onPlayerInit(this);
}
}
for(int i = 0; i < this.scripts.size(); ++i) {
script = (ScriptContainer)this.scripts.get(i);
if (!errored.contains(i)) {
for(int var7 = 0; var7 < this.scripts.size(); ++var7) {
script = (ScriptContainer)this.scripts.get(var7);
if(!ScriptController.Instance.playerScripts.errored.contains(Integer.valueOf(var7))) {
if(script == null || script.errored || !script.hasCode())
return;
script.setEngine(scriptLanguage);
if(script.engine == null)
return;
for(int i = 0; i + 1 < obs.length; i += 2){
Object ob = obs[i + 1];
if(ob instanceof Entity)
ob = ScriptController.Instance.getScriptForEntity((Entity)ob);
script.engine.put(obs[i].toString(), ob);
}
ScriptEngine engine = script.engine;
engine.put("world", dummyWorld);
engine.put("player", dummyPlayer);
PlayerEvent result = (PlayerEvent) engine.get("event");
if(result == null)
engine.put("event", result = new PlayerEvent(this.getPlayer()));
script.engine.put("API", new WrapperNpcAPI());
script.run(type, event);
if (script.errored) {
errored.add(i);
ScriptController.Instance.playerScripts.errored.add(var7);
}
Iterator var8 = script.console.entrySet().iterator();
while(var8.hasNext()) {
Entry<Long, String> entry = (Entry)var8.next();
if (!console.containsKey(entry.getKey())) {
console.put(entry.getKey(), " tab " + (i + 1) + ":\n" + (String)entry.getValue());
if (!ScriptController.Instance.playerScripts.console.containsKey(entry.getKey())) {
ScriptController.Instance.playerScripts.console.put(entry.getKey(), " tab " + (var7 + 1) + ":\n" + (String)entry.getValue());
}
}
script.console.clear();
}
}
}
}