From 34c6e62c8f168fbe6033b4b282e87a47b0676091 Mon Sep 17 00:00:00 2001 From: simon816 Date: Wed, 18 Mar 2015 19:40:30 +0000 Subject: [PATCH] Make ClassInfo.Traversal actually use the provided traverse parameter --- .../java/org/spongepowered/asm/mixin/transformer/ClassInfo.java | 2 +- .../java/org/spongepowered/asm/mixin/transformer/MixinInfo.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java index 3f73578c..a6700a51 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java @@ -93,7 +93,7 @@ class ClassInfo extends TreeInfo { private Traversal(Traversal next, boolean traverse) { this.next = next != null ? next : this; - this.traverse = true; + this.traverse = traverse; } public Traversal next() { diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index 77f4c727..da18845a 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -268,7 +268,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { continue; } - if (!targetClass.hasSuperClass(classNode.superName, ClassInfo.Traversal.NONE)) { + if (!targetClass.hasSuperClass(classNode.superName, ClassInfo.Traversal.IMMEDIATE)) { throw new InvalidMixinException(this, "Super class '" + classNode.superName.replace('/', '.') + "' of " + this.name + " was not found in the hierarchy of target class '" + targetClass + "'"); }