2006-Scape/Parabot
1
0
Fork 0
mirror of https://github.com/2006-Scape/Parabot.git synced 2026-07-05 08:39:30 +00:00
Code Issues 2 Packages Projects Releases 3 Wiki Activity

Merge branch 'development' into feature/launch-by-uuid

Browse Source
This commit is contained in:
Jeroen Ketelaar
2018-09-11 10:41:52 -05:00
committed by GitHub
parent 05ea709aee 6a627f00c1
commit b520e8fe7c
3 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/parabot/core/asm/adapters/AddCallbackAdapter.java
+12 -10
View File
@@ -40,17 +40,19 @@ public class AddCallbackAdapter implements Injectable, Opcodes {
Label l0 = new Label(); Label l0 = new Label();
inject.add(new LabelNode(l0)); inject.add(new LabelNode(l0));
int offset = 0; int offset = 0;
for (int arg : args) { if (args != null) {
if (Modifier.isStatic(method.access)) { for (int arg : args) {
int loadOpcode = ASMUtils.getLoadOpcode(types[arg] if (Modifier.isStatic(method.access)) {
.getDescriptor()); int loadOpcode = ASMUtils.getLoadOpcode(types[arg]
inject.add(new VarInsnNode(loadOpcode, arg + offset)); .getDescriptor());
if (loadOpcode == Opcodes.LLOAD) { inject.add(new VarInsnNode(loadOpcode, arg + offset));
offset++; if (loadOpcode == Opcodes.LLOAD) {
offset++;
}
} else {
inject.add(new VarInsnNode(ASMUtils.getLoadOpcode(types[arg]
.getDescriptor()), arg + 1));
} }
} else {
inject.add(new VarInsnNode(ASMUtils.getLoadOpcode(types[arg]
.getDescriptor()), arg + 1));
} }
} }
inject.add(new MethodInsnNode(INVOKESTATIC, inject.add(new MethodInsnNode(INVOKESTATIC,
src/main/java/org/parabot/core/asm/wrappers/Callback.java
+9 -7
View File
@@ -26,14 +26,16 @@ public class Callback implements Injectable {
this.invokeMethod = callbackMethod; this.invokeMethod = callbackMethod;
this.desc = callbackDesc; this.desc = callbackDesc;
this.conditional = conditional; this.conditional = conditional;
if (args.contains(",")) { if (args.length() > 0) {
final String[] strArgs = args.split(","); if (args.contains(",")) {
this.args = new int[strArgs.length]; final String[] strArgs = args.split(",");
for (int i = 0; i < this.args.length; i++) { this.args = new int[strArgs.length];
this.args[i] = Integer.parseInt(strArgs[i]); for (int i = 0; i < this.args.length; i++) {
this.args[i] = Integer.parseInt(strArgs[i]);
}
} else {
this.args = new int[]{Integer.parseInt(args)};
} }
} else {
this.args = new int[]{ Integer.parseInt(args) };
} }
} }
src/main/java/org/parabot/core/parsers/hooks/XMLHookParser.java
+9
View File
@@ -65,8 +65,17 @@ public class XMLHookParser extends HookParser {
} }
private static final String getValue(String tag, Element element) { private static final String getValue(String tag, Element element) {
if (element.getElementsByTagName(tag).item(0) == null) {
throw new NullPointerException("MISSING HOOK TAG: The '" + tag + "' xml tag is missing from one of the hooks of type: " + element.getParentNode().getNodeName());
}
NodeList nodes = element.getElementsByTagName(tag).item(0) NodeList nodes = element.getElementsByTagName(tag).item(0)
.getChildNodes(); .getChildNodes();
if (nodes.getLength() == 0 || nodes.item(0) == null) {
if (Core.inVerboseMode()) {
System.err.println("WARNING: Invalid Hook " + tag + " subnode. Tag is missing or empty?");
}
return "";
}
Node node = (Node) nodes.item(0); Node node = (Node) nodes.item(0);
return node.getNodeValue(); return node.getNodeValue();
} }