Fix more stack nulls in enchanter

This commit is contained in:
Vincent Lee committed 2017-02-04 19:39:07 -06:00
1 parent ee0740b2bb
commit 02e2c2500a
2 files changed
+5 -5

No files matched your search

@@ -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();
}
@@ -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<EntityItem> 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;