summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorOnyxDarkKnight <sor1n.iliutza16@gmail.com>2013-12-26 23:48:41 +0200
committerOnyxDarkKnight <sor1n.iliutza16@gmail.com>2013-12-26 23:48:41 +0200
commitef409d6f5aa9b4d6c827a17424907eb24e4584b3 (patch)
treeaa3b566f479a48343634432077fc023fe7864543 /common
parent4c5ef8103468672b24bd27831da2cb04de001400 (diff)
Please fix
Diffstat (limited to 'common')
-rw-r--r--common/darkknight/jewelrycraft/renders/TileEntityDisplayerRender.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/darkknight/jewelrycraft/renders/TileEntityDisplayerRender.java b/common/darkknight/jewelrycraft/renders/TileEntityDisplayerRender.java
index 2e5c158..97fab45 100644
--- a/common/darkknight/jewelrycraft/renders/TileEntityDisplayerRender.java
+++ b/common/darkknight/jewelrycraft/renders/TileEntityDisplayerRender.java
@@ -49,7 +49,7 @@ public class TileEntityDisplayerRender extends TileEntitySpecialRenderer
renderLabel(Integer.toString(disp.quantity), 0F, (-0.16F)*ind, 0, block);
GL11.glPopMatrix();
ind++;
- if(disp.object.itemID != Item.map.itemID && disp.object.getTooltip(null, true) != null)
+ if(disp.object.itemID != Item.map.itemID && disp.object != null && disp.object != new ItemStack(0, 0, 0) && disp.object.getTooltip(null, true) != null)
{
for(int i = 1; i < disp.object.getTooltip(null, true).size(); i++)
{