From a2dafd9e417a8100679e5a11fe2882476a6cd3f8 Mon Sep 17 00:00:00 2001 From: Clisprail Date: Fri, 11 Apr 2014 01:55:50 +0200 Subject: [PATCH] Final proper callback fix --- .../src/org/parabot/core/asm/adapters/AddCallbackAdapter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/parabotv2/src/org/parabot/core/asm/adapters/AddCallbackAdapter.java b/parabotv2/src/org/parabot/core/asm/adapters/AddCallbackAdapter.java index 5786daa..620709c 100644 --- a/parabotv2/src/org/parabot/core/asm/adapters/AddCallbackAdapter.java +++ b/parabotv2/src/org/parabot/core/asm/adapters/AddCallbackAdapter.java @@ -1,5 +1,7 @@ package org.parabot.core.asm.adapters; +import java.lang.reflect.Modifier; + import org.objectweb.asm.Label; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; @@ -43,7 +45,7 @@ public class AddCallbackAdapter implements Injectable, Opcodes { inject.add(new LabelNode(l0)); for (int arg : args) { inject.add(new VarInsnNode(ASMUtils.getLoadOpcode(types[arg] - .getDescriptor()), arg)); + .getDescriptor()), Modifier.isStatic(method.access) ? arg : arg + 1)); } inject.add(new MethodInsnNode(INVOKESTATIC, this.invokeClass, this.invokeMethod,