From 90a4c0f165165440cf4552d47c1311fbb7a2b374 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 9 Apr 2015 16:59:21 +0100 Subject: [PATCH] Handle passthrough correctly when mixin config packages overlap --- .../asm/mixin/transformer/MixinTransformer.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java index a8952d15..d20c659e 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -295,14 +295,15 @@ public class MixinTransformer extends TreeTransformer { try { SortedSet mixins = null; + boolean invalidRef = false; for (MixinConfig config : this.configs) { if (config.packageMatch(transformedName)) { if (config.canPassThrough(transformedName)) { return this.passThrough(name, transformedName, basicClass); } - - throw new NoClassDefFoundError(String.format("%s is a mixin class and cannot be referenced directly", transformedName)); + invalidRef = true; + continue; } if (config.hasMixinsFor(transformedName)) { @@ -315,6 +316,10 @@ public class MixinTransformer extends TreeTransformer { } } + if (invalidRef) { + throw new NoClassDefFoundError(String.format("%s is a mixin class and cannot be referenced directly", transformedName)); + } + if (mixins != null) { // Re-entrance is "safe" as long as we don't need to apply any mixins, if there are mixins then we need to panic now if (locked) {