diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index 5d8c81cb6..cb75a7042 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -123,7 +123,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, && stack.isItemEnchantable() && stack.getCount() == 1; - if(enchanter.itemToEnchant == null) { + if(enchanter.itemToEnchant.isEmpty()) { if(stackEnchantable) { enchanter.itemToEnchant = stack.copy(); player.setHeldItem(hand, ItemStack.EMPTY); @@ -131,7 +131,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, } } else if(enchanter.stage == TileEnchanter.State.IDLE) { ItemHandlerHelper.giveItemToPlayer(player, enchanter.itemToEnchant.copy()); - enchanter.itemToEnchant = null; + enchanter.itemToEnchant = ItemStack.EMPTY; enchanter.sync(); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index c8993ed96..b664dbb1e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -114,7 +114,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } public void onWanded(EntityPlayer player, ItemStack wand) { - if(stage != State.IDLE || itemToEnchant == null || !itemToEnchant.isItemEnchantable()) + if(stage != State.IDLE || itemToEnchant.isEmpty() || !itemToEnchant.isItemEnchantable()) return; List items = world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.getX() - 2, pos.getY(), pos.getZ() - 2, pos.getX() + 3, pos.getY() + 1, pos.getZ() + 3)); @@ -327,7 +327,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { cmp.setInteger(TAG_STAGE_3_END_TICKS, stage3EndTicks); NBTTagCompound itemCmp = new NBTTagCompound(); - if(itemToEnchant != null) + if(!itemToEnchant.isEmpty()) itemCmp = itemToEnchant.writeToNBT(itemCmp); cmp.setTag(TAG_ITEM, itemCmp); @@ -428,7 +428,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } public void renderHUD(ScaledResolution res) { - if(manaRequired > 0 && itemToEnchant != null) { + if(manaRequired > 0 && !itemToEnchant.isEmpty()) { int x = res.getScaledWidth() / 2 + 20; int y = res.getScaledHeight() / 2 - 8;