From 0caf328c1245347e45a0e1dc9fa6bde3346f41b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Tue, 17 Feb 2015 12:39:35 +0100
Subject: [PATCH] Fixes possible NPE in Raid tooltip, closes #918.

---
 src/main/scala/li/cil/oc/common/block/Raid.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/li/cil/oc/common/block/Raid.scala b/src/main/scala/li/cil/oc/common/block/Raid.scala
index 7c32128e3..e23b1a959 100644
--- a/src/main/scala/li/cil/oc/common/block/Raid.scala
+++ b/src/main/scala/li/cil/oc/common/block/Raid.scala
@@ -29,7 +29,7 @@ class Raid(protected implicit val tileTag: ClassTag[tileentity.Raid]) extends Si
     super.tooltipTail(metadata, stack, player, tooltip, advanced)
     if (KeyBindings.showExtendedTooltips) {
       val data = new RaidData(stack)
-      for (disk <- data.disks) {
+      for (disk <- data.disks if disk != null) {
         tooltip.add("- " + disk.getDisplayName)
       }
     }