From 5310ec26154c49d904cdc87b7661f2ae42b43134 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Sat, 4 Apr 2015 18:14:24 +0100 Subject: [PATCH] Deal with inner's outerClass reference being null sometimes, closes #34 --- .../spongepowered/asm/mixin/transformer/MixinInfo.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 8eb4a5b8..eeb6f34f 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -359,10 +359,12 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { */ private void readInnerClasses(ClassNode classNode) { for (InnerClassNode inner : classNode.innerClasses) { - if (inner.outerName.equals(this.classInfo.getName())) { - ClassInfo innerClass = ClassInfo.forName(inner.name); - if (innerClass.isSynthetic() && innerClass.isProbablyStatic()) { + ClassInfo innerClass = ClassInfo.forName(inner.name); + if (innerClass.isSynthetic() && innerClass.isProbablyStatic()) { + if ((inner.outerName != null && inner.outerName.equals(this.classInfo.getName())) || inner.name.startsWith(classNode.name + "$")) { this.syntheticInnerClasses.add(inner.name); + } else { + throw new InvalidMixinException(this, "Unhandled synthetic inner class found: " + inner.name); } } }