From 46914d2a8b6b548e8953e2c8f71639caf0c89615 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 30 Aug 2015 22:38:17 +0100 Subject: [PATCH] Fixed a crash when the Black Hole Talisman is used on lit redstone ore. Closes #1320 --- .../vazkii/botania/common/item/ItemBlackHoleTalisman.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 8d67e43ac..aa3b6a9bc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -190,7 +190,9 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { public String getItemStackDisplayName(ItemStack par1ItemStack) { Block block = getBlock(par1ItemStack); int meta = getBlockMeta(par1ItemStack); - return super.getItemStackDisplayName(par1ItemStack) + (block == null ? "" : " (" + EnumChatFormatting.GREEN + new ItemStack(block, 1, meta).getDisplayName() + EnumChatFormatting.RESET + ")"); + ItemStack stack = new ItemStack(block, 1, meta); + + return super.getItemStackDisplayName(par1ItemStack) + ((stack == null || stack.getItem() == null) ? "" : " (" + EnumChatFormatting.GREEN + stack.getDisplayName() + EnumChatFormatting.RESET + ")"); } @Override