Fix: Check the staticness of the original call not the current one. (#…

…132)
FabricMC · Mar 8, 2024 · 8c8ece2 · 8c8ece2
1 parent d7eda8d
commit 8c8ece2
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/util/InvokeUtil.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/util/InvokeUtil.java
@@ -38,10 +38,11 @@ public static Type[] getOriginalArgs(InjectionNode node) {
     }
 
     public static Type[] getCurrentArgs(InjectionNode node) {
-        MethodInsnNode methodNode = (MethodInsnNode) node.getCurrentTarget();
-        Type[] currentArgs = Type.getArgumentTypes(methodNode.desc);
-        if (node.isReplaced() && node.hasDecoration(RedirectInjector.Meta.KEY) && methodNode.getOpcode() != Opcodes.INVOKESTATIC) {
-            // A non-static redirect handler method will have an extra arg at the start that we don't care about.
+        MethodInsnNode original = (MethodInsnNode) node.getOriginalTarget();
+        MethodInsnNode current = (MethodInsnNode) node.getCurrentTarget();
+        Type[] currentArgs = Type.getArgumentTypes(current.desc);
+        if (node.isReplaced() && node.hasDecoration(RedirectInjector.Meta.KEY) && original.getOpcode() != Opcodes.INVOKESTATIC) {
+            // A redirect on a non-static target method will have an extra arg at the start that we don't care about.
             return Arrays.copyOfRange(currentArgs, 1, currentArgs.length);
         }
         return currentArgs;