From f87008208c6e26e6783d546bfbb4e136299473eb Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 23 Dec 2020 19:22:15 +0000 Subject: [PATCH] Use staticness of invoker for arg offset, fixes #444 --- .../asm/mixin/gen/AccessorGeneratorMethodProxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/gen/AccessorGeneratorMethodProxy.java b/src/main/java/org/spongepowered/asm/mixin/gen/AccessorGeneratorMethodProxy.java index c8504c76..c91baece 100644 --- a/src/main/java/org/spongepowered/asm/mixin/gen/AccessorGeneratorMethodProxy.java +++ b/src/main/java/org/spongepowered/asm/mixin/gen/AccessorGeneratorMethodProxy.java @@ -74,7 +74,7 @@ public class AccessorGeneratorMethodProxy extends AccessorGenerator { if (!this.targetIsStatic) { method.instructions.add(new VarInsnNode(Opcodes.ALOAD, 0)); } - Bytecode.loadArgs(this.argTypes, method.instructions, this.targetIsStatic ? 0 : 1); + Bytecode.loadArgs(this.argTypes, method.instructions, this.info.isStatic ? 0 : 1); boolean isPrivate = Bytecode.hasFlag(this.targetMethod, Opcodes.ACC_PRIVATE); int opcode = this.targetIsStatic ? Opcodes.INVOKESTATIC : (isPrivate ? Opcodes.INVOKESPECIAL : Opcodes.INVOKEVIRTUAL); method.instructions.add(new MethodInsnNode(opcode, this.info.getClassNode().name, this.targetMethod.name, this.targetMethod.desc, false));