From 7074b9b1b37ac17b7eb2ee1cf65280eb67cfb1f9 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 22 Apr 2015 00:58:19 +0100 Subject: [PATCH] Fix bug which prevented identically-named mixins in configs --- .../spongepowered/asm/mixin/transformer/MixinConfig.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java index 97da2b71..f8464e03 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -324,14 +324,16 @@ class MixinConfig implements Comparable { } for (String mixinClass : mixinClasses) { - if (mixinClass == null || MixinConfig.globalMixinList.contains(mixinClass)) { + String fqMixinClass = this.mixinPackage + mixinClass; + + if (mixinClass == null || MixinConfig.globalMixinList.contains(fqMixinClass)) { continue; } try { MixinInfo mixin = new MixinInfo(this, mixinClass, true, this.plugin, suppressPlugin); if (mixin.getTargetClasses().size() > 0) { - MixinConfig.globalMixinList.add(mixinClass); + MixinConfig.globalMixinList.add(fqMixinClass); for (String targetClass : mixin.getTargetClasses()) { String targetClassName = targetClass.replace('/', '.'); this.mixinsFor(targetClassName).add(mixin);