From 0e485e17a39f0a9d8dfab87d93eb935d64bd7ab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Mon, 8 Jun 2015 19:59:08 +0200 Subject: [PATCH] Fixed potential NPE when checking for new SimpleComponent annotation. --- src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala b/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala index 1c7ff8d53..3fcd4065a 100644 --- a/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala +++ b/src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala @@ -134,7 +134,8 @@ class ClassTransformer extends IClassTransformer { { val classNode = newClassNode(transformedClass) if (classNode.interfaces.contains("li/cil/oc/api/network/SimpleComponent") && - !classNode.visibleAnnotations.exists(_.desc == "Lli/cil/oc/api/network/SimpleComponent$SkipInjection;")) { + (classNode.visibleAnnotations == null || !classNode.visibleAnnotations. + exists(annotation => annotation != null && annotation.desc == "Lli/cil/oc/api/network/SimpleComponent$SkipInjection;"))) { try { transformedClass = injectEnvironmentImplementation(classNode) log.info(s"Successfully injected component logic into class $name.")