From 5c5b2a3886a65c56e1a33db2e3ba3b8034fa4047 Mon Sep 17 00:00:00 2001 From: HenryLoenwind Date: Wed, 25 Feb 2015 01:24:02 +0100 Subject: [PATCH] Added check for block without items Simple null check, may fix #2007 --- .../crazypants/enderio/machine/painter/PainterUtil.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/painter/PainterUtil.java b/src/main/java/crazypants/enderio/machine/painter/PainterUtil.java index 479bae34..ea52cd0f 100644 --- a/src/main/java/crazypants/enderio/machine/painter/PainterUtil.java +++ b/src/main/java/crazypants/enderio/machine/painter/PainterUtil.java @@ -57,8 +57,11 @@ public final class PainterUtil { Block sourceId = PainterUtil.getSourceBlock(item); int meta = PainterUtil.getSourceBlockMetadata(item); if(sourceId != null) { - ItemStack is = new ItemStack(Item.getItemFromBlock(sourceId), 1, meta); - sourceName = is.getDisplayName(); + Item itemFromBlock = Item.getItemFromBlock(sourceId); + if (itemFromBlock != null) { + ItemStack is = new ItemStack(itemFromBlock, 1, meta); + sourceName = is.getDisplayName(); + } } return Lang.localize("blockPainter.paintedWith") + " " + sourceName; }