Merge pull request Mithion#1236 from DoomFruit/WardingCandleFix

Fix for issue Mithion#1131 (warding candle crash on redstone ore)
DoomFruit · Sep 12, 2015 · 2cfc581 · 2cfc581
2 parents 1b0b0bc + 02cb49d
commit 2cfc581
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/main/java/am2/items/ItemCandle.java b/src/main/java/am2/items/ItemCandle.java
@@ -55,7 +55,7 @@ public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int
 		if (!world.isRemote){
 
 			if (stack.hasTagCompound() && stack.stackTagCompound.hasKey("search_block")){
-				player.addChatMessage(new ChatComponentText("am2.tooltip.candlecantplace"));
+				player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("am2.tooltip.candlecantplace")));
 				return false;
 			}
 
@@ -171,7 +171,13 @@ public String getItemStackDisplayName(ItemStack stack){
 		String name = StatCollector.translateToLocal("item.arsmagica2:warding_candle.name");
 		if (stack.hasTagCompound() && stack.stackTagCompound.hasKey("search_block")){
 			ItemStack blockStack = new ItemStack(Block.getBlockById(stack.stackTagCompound.getInteger("search_block")), 1, stack.stackTagCompound.getInteger("search_meta"));
-			name += " (" + blockStack.getDisplayName() + ")";
+			Item tempItem = blockStack.getItem();
+			if(tempItem == null){
+				name += " (" + stack.stackTagCompound.getInteger("search_block") + ":" + stack.stackTagCompound.getInteger("search_meta") + ")";
+			}
+			else{
+				name += " (" + blockStack.getDisplayName() + ")";
+			}
 		}else{
 			name += " (" + StatCollector.translateToLocal("am2.tooltip.unattuned") + ")";
 		}

diff --git a/src/main/resources/assets/arsmagica2/lang/en_US.lang b/src/main/resources/assets/arsmagica2/lang/en_US.lang
@@ -691,4 +691,4 @@ achievement.componentUnlock=Discovered Spell Part
 
 Legendary Mana Restoration.postfix=Legendary Mana Potion
 Epic Mana Restoration.postfix=Epic Mana Potion
-Greater Mana Restoration.postfix=Greater Mana Potion
+Greater Mana Restoration.postfix=Greater Mana Potion