summaryrefslogtreecommitdiff
path: root/common/darkknight/jewelrycraft/item/ItemRing.java
diff options
context:
space:
mode:
authorOnyxDarkKnight <sor1n.iliutza16@gmail.com>2014-04-13 18:12:27 +0300
committerOnyxDarkKnight <sor1n.iliutza16@gmail.com>2014-04-13 18:12:27 +0300
commitf965cf88704f1e5e674d98308cbe0f4451d7edeb (patch)
tree037091498442b0e589166c02d4342cbb7828dca4 /common/darkknight/jewelrycraft/item/ItemRing.java
parentdbe39cf7e6ddc6c6fd1e639b495a8ac568e081a9 (diff)
Fixed stuff
Diffstat (limited to 'common/darkknight/jewelrycraft/item/ItemRing.java')
-rw-r--r--common/darkknight/jewelrycraft/item/ItemRing.java4
1 files changed, 2 insertions, 2 deletions
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();