From 23d81ba1ed551840499a884f01d606c68e542e32 Mon Sep 17 00:00:00 2001 From: Candice Neill Date: Sun, 2 Aug 2015 11:11:41 -0500 Subject: [PATCH] Fixed ArrayIndexOutOfBoundsException on DiamondApple getUnlocalizedName(); tweaked to boni's specs --- src/main/java/tconstruct/armor/items/DiamondApple.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/tconstruct/armor/items/DiamondApple.java b/src/main/java/tconstruct/armor/items/DiamondApple.java index ec13696b..3fb21b7b 100644 --- a/src/main/java/tconstruct/armor/items/DiamondApple.java +++ b/src/main/java/tconstruct/armor/items/DiamondApple.java @@ -76,16 +76,12 @@ public class DiamondApple extends ItemFood public String getUnlocalizedName (ItemStack itemstack) { int damage = itemstack.getItemDamage(); - int name_index = 0; + int name_index = damage; - if( damage < 0 ) + if( name_index < 0 || name_index >= itemNames.length ) { name_index = 0; } - else if( damage >= itemNames.length ) - { - name_index = itemNames.length-1; - } return (new StringBuilder()).append("item.food.").append(itemNames[name_index]).toString(); }