From f965cf88704f1e5e674d98308cbe0f4451d7edeb Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Sun, 13 Apr 2014 18:12:27 +0300 Subject: Fixed stuff --- common/darkknight/jewelrycraft/item/ItemRing.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common/darkknight/jewelrycraft/item/ItemRing.java') diff --git a/common/darkknight/jewelrycraft/item/ItemRing.java b/common/darkknight/jewelrycraft/item/ItemRing.java index 3824edb..b27e8ac 100644 --- a/common/darkknight/jewelrycraft/item/ItemRing.java +++ b/common/darkknight/jewelrycraft/item/ItemRing.java @@ -84,7 +84,7 @@ public class ItemRing extends Item ResourceManager rm = Minecraft.getMinecraft().getResourceManager(); BufferedImage icon; int x=0, y=0, ok = 0, red, green, blue; - if (pass == 0 && JewelryNBT.ingot(stack) != null && JewelryNBT.ingotColor(stack) == 16777215) + if (pass == 0 && JewelryNBT.ingot(stack) != null && JewelryNBT.ingot(stack).getIconIndex() != null && JewelryNBT.ingotColor(stack) == 16777215) { String ingotIconName = JewelryNBT.ingot(stack).getIconIndex().getIconName(); @@ -117,7 +117,7 @@ public class ItemRing extends Item } JewelryNBT.addIngotColor(stack, icon.getRGB(x, y)); } - else if (pass == 1 && JewelryNBT.jewel(stack) != null && JewelryNBT.jewelColor(stack) == 16777215) + else if (pass == 1 && JewelryNBT.jewel(stack) != null && JewelryNBT.jewel(stack).getIconIndex() != null && JewelryNBT.jewelColor(stack) == 16777215) { x = 0; y = 0; ok=0; String jewelIconName = JewelryNBT.jewel(stack).getIconIndex().getIconName(); -- cgit v1.2.3