From 424ba13bb267bb8fc61180b2632436955dac9f84 Mon Sep 17 00:00:00 2001 From: Christian Date: Sun, 10 Mar 2013 01:20:08 -0500 Subject: [PATCH] Fix supertype parsing to handle null superclass (Hi Object!). Closes #160 --- fml/common/cpw/mods/fml/common/discovery/asm/ASMModParser.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fml/common/cpw/mods/fml/common/discovery/asm/ASMModParser.java b/fml/common/cpw/mods/fml/common/discovery/asm/ASMModParser.java index 88f9feba4..c95f161f9 100644 --- a/fml/common/cpw/mods/fml/common/discovery/asm/ASMModParser.java +++ b/fml/common/cpw/mods/fml/common/discovery/asm/ASMModParser.java @@ -25,6 +25,7 @@ import org.objectweb.asm.ClassReader; import org.objectweb.asm.Type; import com.google.common.base.Objects; +import com.google.common.base.Strings; import com.google.common.collect.Lists; import cpw.mods.fml.common.FMLLog; @@ -64,7 +65,7 @@ public class ASMModParser { this.asmType = Type.getObjectType(typeQName); this.classVersion = classVersion; - this.asmSuperType = Type.getObjectType(superClassQName); + this.asmSuperType = !Strings.isNullOrEmpty(superClassQName) ? Type.getObjectType(superClassQName) : null; } public void startClassAnnotation(String annotationName)