From 873aedf4e565ae5955c13ef5f54059c5f1e8ee78 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 10 Jun 2016 19:31:11 -0500 Subject: [PATCH] Fix #332 --- .../botania/common/block/BlockOpenCrate.java | 7 ++++--- .../botania/common/block/tile/TileCraftCrate.java | 14 ++++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 0b7985176..15a54cb16 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -123,9 +123,10 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, @Override public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); - - InventoryHelper.dropInventory(inv, par1World, state, pos); + if (!par1World.isRemote) { + TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos); + InventoryHelper.dropInventory(inv, par1World, state, pos); + } super.breakBlock(par1World, pos, state); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 2756e1463..c69fc2482 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -70,7 +70,7 @@ public class TileCraftCrate extends TileOpenCrate { private static final String TAG_PATTERN = "pattern"; public int pattern = -1; - int signal = 0; + private int signal = 0; @Override public int getSizeInventory() { @@ -117,7 +117,7 @@ public class TileCraftCrate extends TileOpenCrate { } } - boolean craft(boolean fullCheck) { + private boolean craft(boolean fullCheck) { if(fullCheck && !isFull()) return false; @@ -163,14 +163,14 @@ public class TileCraftCrate extends TileOpenCrate { return true; } - void ejectAll() { + private void ejectAll() { for(int i = 0; i < getSizeInventory(); ++i) { ItemStack stack = itemHandler.getStackInSlot(i); if(stack != null) eject(stack, false); itemHandler.setStackInSlot(i, null); - markDirty(); } + markDirty(); } @Override @@ -187,8 +187,10 @@ public class TileCraftCrate extends TileOpenCrate { @Override public boolean onWanded(EntityPlayer player, ItemStack stack) { - craft(false); - ejectAll(); + if(!player.worldObj.isRemote) { + craft(false); + ejectAll(); + } return true; }