Fix?

3 files changed, 5 insertions, 4 deletions

diff --git a/common/darkknight/jewelrycraft/block/BlockDisplayer.java b/common/darkknight/jewelrycraft/block/BlockDisplayer.java
index 02de477..e0061ae 100644
--- a/common/darkknight/jewelrycraft/block/BlockDisplayer.java
+++ b/common/darkknight/jewelrycraft/block/BlockDisplayer.java
@@ -59,7 +59,7 @@ public class BlockDisplayer extends BlockContainer
     {
         TileEntityDisplayer te = (TileEntityDisplayer) world.getBlockTileEntity(i, j, k);
         ItemStack item = entityPlayer.inventory.getCurrentItem();
-        if (te != null && item != null && !world.isRemote)
+        if (te != null && item != null && item != new ItemStack(0, 0, 0) && !world.isRemote)
         {
             if(!te.hasObject)
             {
@@ -87,7 +87,7 @@ public class BlockDisplayer extends BlockContainer
         TileEntityDisplayer te = (TileEntityDisplayer) world.getBlockTileEntity(i, j, k);
         if (te != null && !world.isRemote)
         {
-            if (te.hasObject && player.inventory.addItemStackToInventory(te.object))
+            if (te.hasObject && te.object != null && te.object != new ItemStack(0, 0, 0) && player.inventory.addItemStackToInventory(te.object))
             {
                 if(player.isSneaking())
                 {
diff --git a/common/darkknight/jewelrycraft/config/ConfigHandler.java b/common/darkknight/jewelrycraft/config/ConfigHandler.java
index d23d358..9ae6e2b 100644
--- a/common/darkknight/jewelrycraft/config/ConfigHandler.java
+++ b/common/darkknight/jewelrycraft/config/ConfigHandler.java
@@ -14,9 +14,9 @@ public class ConfigHandler
     
     public static int            idShadowOre          = 1750;
     public static int            idSmelter            = 1751;
-    public static int            idDisplayer          = 1752;
     public static int            idJewelCraftingTable = 1753;
     public static int            idMolder             = 1754;
+    public static int            idDisplayer          = 1755;
     
     public static int            ingotCoolingTime     = 200;
     public static int            ingotMeltingTime     = 1500;
diff --git a/common/darkknight/jewelrycraft/renders/TileEntityDisplayerRender.java b/common/darkknight/jewelrycraft/renders/TileEntityDisplayerRender.java
index a354a11..2e5c158 100644
--- a/common/darkknight/jewelrycraft/renders/TileEntityDisplayerRender.java
+++ b/common/darkknight/jewelrycraft/renders/TileEntityDisplayerRender.java
@@ -11,6 +11,7 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 import darkknight.jewelrycraft.model.ModelDisplayer;
 import darkknight.jewelrycraft.tileentity.TileEntityDisplayer;
 import net.minecraft.tileentity.TileEntity;
@@ -37,7 +38,7 @@ public class TileEntityDisplayerRender extends TileEntitySpecialRenderer
         GL11.glPushMatrix();
         GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
         displayer.render((Entity) null, disp.ringTranslation1, disp.ringTranslation2, disp.ringTranslation3, 0.0F, 0.0F, 0.0625F);
-        if(disp != null && disp.hasObject)
+        if(disp != null && disp.hasObject && disp.object != null && disp.object != new ItemStack(0, 0, 0))
         {
             int ind = -3;
             GL11.glPushMatrix();