diff --git a/src/codechicken/multipart/asm/ASMMixinCompiler.scala b/src/codechicken/multipart/asm/ASMMixinCompiler.scala index 61f72af..a250b1f 100644 --- a/src/codechicken/multipart/asm/ASMMixinCompiler.scala +++ b/src/codechicken/multipart/asm/ASMMixinCompiler.scala @@ -262,7 +262,10 @@ object ASMMixinCompiler def writeStaticBridge(mv: MethodNode, mname: String, t: MixinInfo) = writeBridge(mv, mv.desc, INVOKESTATIC, t.tname, mname, staticDesc(t.name, mv.desc)) - def mixinClasses(name: String, superClass: String, traits: Seq[String]) = { + def mixinClasses(name: String, superClass: String, traits: Seq[String]):Class[_] = { + if(traits.isEmpty) + return cl.findClass(superClass.name.replace('/', '.')) + val startTime = System.currentTimeMillis val baseTraits = traits.map(mixinMap) diff --git a/src/codechicken/multipart/asm/ASMMixinFactory.scala b/src/codechicken/multipart/asm/ASMMixinFactory.scala index 2505a31..7cf8b10 100644 --- a/src/codechicken/multipart/asm/ASMMixinFactory.scala +++ b/src/codechicken/multipart/asm/ASMMixinFactory.scala @@ -13,7 +13,6 @@ class ASMMixinFactory[T](val baseType:Class[T], private val paramTypes:Class[_]* private val traitMap = mutable.Map[String, Int]() private val traits = ArrayBuffer[String]() private val classMap = mutable.Map[BitSet, Constructor[_ <: T]]() - classMap.put(new BitSet, baseType.getDeclaredConstructor(paramTypes:_*)) private var ugenid = 0