From dc4ad7dd3d28367e53c94d3de5fc390d02cd7ada Mon Sep 17 00:00:00 2001 From: Henry Loenwind Date: Wed, 25 Mar 2015 13:51:52 +0100 Subject: [PATCH] Fix: Properly set up farmerJoe Properly set up farmerJoe when fertilizing --- .../crazypants/enderio/machine/farm/TileFarmStation.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index 82628096..f15c17ed 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -473,9 +473,12 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { if (hasBonemeal() && bonemealCooldown-- <= 0) { Fertilizer fertilizer = Fertilizer.getInstance(inventory[minFirtSlot]); if ((fertilizer.applyOnPlant() != isOpen(bc)) || (fertilizer.applyOnAir() == worldObj.isAirBlock(bc.x, bc.y, bc.z))) { + farmerJoe.inventory.mainInventory[0] = inventory[minFirtSlot]; + farmerJoe.inventory.currentItem = 0; if (fertilizer.apply(inventory[minFirtSlot], farmerJoe, worldObj, bc)) { + inventory[minFirtSlot] = farmerJoe.inventory.mainInventory[0]; PacketHandler.INSTANCE.sendToAllAround(new PacketFarmAction(bc), new TargetPoint(worldObj.provider.dimensionId, bc.x, bc.y, bc.z, 64)); - if (inventory[minFirtSlot].stackSize == 0) { + if (inventory[minFirtSlot] != null && inventory[minFirtSlot].stackSize == 0) { inventory[minFirtSlot] = null; } usePower(Config.farmBonemealActionEnergyUseRF); @@ -484,6 +487,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { usePower(Config.farmBonemealTryEnergyUseRF); bonemealCooldown = 5; } + farmerJoe.inventory.mainInventory[0] = null; } } }