Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Script engine refactor preparation (#492)

Browse Source 
* Fix Invocable casting, remove useless script engine cache

* Remove useless script retry

* Remove null reference in EventManager
This commit is contained in:
kolakcc
2019-08-15 01:47:00 +02:00
committed by Ronan Lana
parent 993398180e
commit 2295317a84
6 changed files with 63 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/scripting/npc/NPCScriptManager.java
View File

@@ -30,7 +30,10 @@ import java.util.List;
import java.util.Map;
import javax.script.Invocable;
import javax.script.ScriptEngine;
import javax.script.ScriptException;
import jdk.nashorn.api.scripting.NashornScriptEngine;
import net.server.world.MaplePartyCharacter;
import scripting.AbstractScriptManager;
@@ -56,7 +59,7 @@ public class NPCScriptManager extends AbstractScriptManager {
public boolean isNpcScriptAvailable(MapleClient c, String fileName) {
Invocable iv = null;
if (fileName != null) {
iv = getInvocable("npc/" + fileName + ".js", c);
iv = getScriptEngine("npc/" + fileName + ".js", c);
}
return iv != null;
@@ -90,24 +93,19 @@ public class NPCScriptManager extends AbstractScriptManager {
return;
}
cms.put(c, cm);
Invocable iv = null;
iv = getInvocable("npc/" + filename + ".js", c);
NashornScriptEngine iv = getScriptEngine("npc/" + filename + ".js", c);
if (iv == null) {
c.getPlayer().dropMessage(1, npc + "");
cm.dispose();
return;
}
engine.put("cm", cm);
iv.put("cm", cm);
scripts.put(c, iv);
try {
iv.invokeFunction("start", chrs);
} catch (final NoSuchMethodException nsme) {
try {
iv.invokeFunction("start", chrs);
} catch (final NoSuchMethodException nsma) {
nsma.printStackTrace();
}
nsme.printStackTrace();
}
} catch (final UndeclaredThrowableException ute) {
@@ -127,25 +125,25 @@ public class NPCScriptManager extends AbstractScriptManager {
}
if (c.canClickNPC()) {
cms.put(c, cm);
Invocable iv = null;
NashornScriptEngine iv = null;
if (!itemScript) {
if (fileName != null) {
iv = getInvocable("npc/" + fileName + ".js", c);
iv = getScriptEngine("npc/" + fileName + ".js", c);
}
} else {
if (fileName != null) { // thanks MiLin for drafting NPC-based item scripts
iv = getInvocable("item/" + fileName + ".js", c);
iv = getScriptEngine("item/" + fileName + ".js", c);
}
}
if (iv == null) {
iv = getInvocable("npc/" + npc + ".js", c);
iv = getScriptEngine("npc/" + npc + ".js", c);
cm.resetItemScript();
}
if (iv == null) {
dispose(c);
return false;
}
engine.put(engineName, cm);
iv.put(engineName, cm);
scripts.put(c, iv);
c.setClickedNPC();
try {