Merge branch 'development' into cleanup/duplicated-class

src/main/java/org/parabot/core/Context.java

@@ -185,9 +185,13 @@ public class Context {
         panel.add(gameApplet);
         panel.validate();
 
+        serverProvider.preAppletInit();
+
         gameApplet.init();
         gameApplet.start();
 
+        serverProvider.postAppletStart();
+
         java.util.Timer t = new java.util.Timer();
         t.schedule(new TimerTask() {
             @Override

src/main/java/org/parabot/core/asm/adapters/AddCallbackAdapter.java

@@ -40,17 +40,19 @@ public class AddCallbackAdapter implements Injectable, Opcodes {
         Label        l0     = new Label();
         inject.add(new LabelNode(l0));
         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,

src/main/java/org/parabot/core/asm/wrappers/Callback.java

@@ -26,14 +26,16 @@ public class Callback implements Injectable {
         this.invokeMethod = callbackMethod;
         this.desc = callbackDesc;
         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/desc/ServerDescription.java

@@ -37,6 +37,9 @@ public class ServerDescription implements Comparable<ServerDescription> {
 
     @Override
     public int compareTo(ServerDescription o) {
+        if (this.getServerName().equalsIgnoreCase(o.getServerName())) {
+            return 1;
+        }
         return this.getServerName().compareTo(o.getServerName());
     }
 

src/main/java/org/parabot/core/parsers/hooks/XMLHookParser.java

@@ -65,8 +65,17 @@ public class XMLHookParser extends HookParser {
     }
 
     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)
                 .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);
         return node.getNodeValue();
     }

src/main/java/org/parabot/environment/servers/ServerProvider.java

@@ -146,4 +146,20 @@ public abstract class ServerProvider implements Opcodes {
 
     }
 
+    /**
+     * Called in Context.setApplet before applet.init() is called. Exclusively used for manipulating the Frame attached
+     * to the applet of Roatpkz.
+     */
+    public void preAppletInit() {
+
+    }
+
+    /**
+     * Called in Context.setApplet before after applet.start()  and applet.init() are called. Exclusively used for manipulating the Frame attached
+     * to the applet of Roatpkz.
+     */
+    public void postAppletStart() {
+
+    }
+
 }