Fix permissiveness behaviour in BeforeInvoke, fixes SpongePowered#204

Chocohead · Aug 15, 2017 · ad79bf9 · ad79bf9
1 parent 2f63e40
commit ad79bf9
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/points/BeforeInvoke.java b/src/main/java/org/spongepowered/asm/mixin/injection/points/BeforeInvoke.java
@@ -122,11 +122,22 @@ public BeforeInvoke setLogging(boolean logging) {
      */
     @Override
     public boolean find(String desc, InsnList insns, Collection<AbstractInsnNode> nodes) {
-        int ordinal = 0;
-        boolean found = false;
-
         this.log("{} is searching for an injection point in method with descriptor {}", this.className, desc);
+
+        if (!this.find(desc, insns, nodes, this.target)) {
+            return this.find(desc, insns, nodes, this.permissiveTarget);
+        }
+        return true;
+    }
 
+    protected boolean find(String desc, InsnList insns, Collection<AbstractInsnNode> nodes, MemberInfo target) {
+        if (target == null) {
+            return false;
+        }
+
+        int ordinal = 0;
+        boolean found = false;
+
         ListIterator<AbstractInsnNode> iter = insns.iterator();
         while (iter.hasNext()) {
             AbstractInsnNode insn = iter.next();
@@ -135,7 +146,7 @@ public boolean find(String desc, InsnList insns, Collection<AbstractInsnNode> no
                 MemberInfo nodeInfo = new MemberInfo(insn);
                 this.log("{} is considering insn {}", this.className, nodeInfo);
 
-                if (this.matches(nodeInfo)) {
+                if (target.matches(nodeInfo.owner, nodeInfo.name, nodeInfo.desc)) {
                     this.log("{} > found a matching insn, checking preconditions...", this.className);
 
                     if (this.matchesInsn(nodeInfo, ordinal)) {
@@ -158,14 +169,6 @@ public boolean find(String desc, InsnList insns, Collection<AbstractInsnNode> no
         return found;
     }
 
-    private boolean matches(MemberInfo nodeInfo) {
-        if (this.target.matches(nodeInfo.owner, nodeInfo.name, nodeInfo.desc)) {
-            return true;
-        }
-
-        return this.permissiveTarget != null && this.permissiveTarget.matches(nodeInfo.owner, nodeInfo.name, nodeInfo.desc);
-    }
-
     protected boolean addInsn(InsnList insns, Collection<AbstractInsnNode> nodes, AbstractInsnNode insn) {
         nodes.add(insn);
         return true;