From a75bcd18557626006a0992da2e2cdc03ff5ebb1b Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Tue, 30 Dec 2014 16:31:21 -0500 Subject: [PATCH] Fix wrong behavior of berry bush harvester --- .../farm/farmers/NaturaBerryFarmer.java | 50 ++++++++++++------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/NaturaBerryFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/NaturaBerryFarmer.java index 8dcdd929..6a38243a 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/NaturaBerryFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/NaturaBerryFarmer.java @@ -18,7 +18,7 @@ public class NaturaBerryFarmer extends PickableFarmer { @Override public IHarvestResult harvestBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - + if(block != getPlantedBlock()) { return null; } @@ -26,28 +26,33 @@ public class NaturaBerryFarmer extends PickableFarmer { farm.setNotification(TileFarmStation.NOTIFICATION_NO_HOE); return null; } - - IHarvestResult res = new HarvestResult(); - + + IHarvestResult res = new HarvestResult(); + BlockCoord checkBlock = bc; - for(int i=0; i < 5 && farm.hasHoe(); i++) { + for (int i = 0; i < 5 && farm.hasHoe(); i++) { meta = farm.getBlockMeta(checkBlock); - IHarvestResult blockRes = super.harvestBlock(farm, checkBlock, block, meta); - - if(blockRes != null) { - res.getHarvestedBlocks().add(checkBlock); - List addToDrops = blockRes.getDrops(); - for(EntityItem stack : addToDrops) { - res.getDrops().add(stack); + block = farm.getBlock(checkBlock); + + if(super.canHarvest(farm, bc, block, meta)) { // redundant check because our canHarvest checks all 5 blocks so a bush may be invalid in the stack of 5 + IHarvestResult blockRes = super.harvestBlock(farm, checkBlock, block, meta); + + if(blockRes != null) { + res.getHarvestedBlocks().add(checkBlock); + List addToDrops = blockRes.getDrops(); + for (EntityItem stack : addToDrops) { + res.getDrops().add(stack); + } } } + checkBlock = checkBlock.getLocation(ForgeDirection.UP); } - + if(res.getHarvestedBlocks().isEmpty()) { return null; - } - + } + return res; } @@ -56,11 +61,18 @@ public class NaturaBerryFarmer extends PickableFarmer { if(!Config.farmEssenceBerriesEnabled && "tile.ore.berries.two".equals(block.getUnlocalizedName()) && meta == grownBlockMeta) { return false; } - + BlockCoord checkBlock = bc; - meta = farm.getBlockMeta(checkBlock); - block = checkBlock.getBlock(farm.getWorldObj()); - return super.canHarvest(farm, checkBlock, block, meta); + for (int i = 0; i < 5; i++) { + meta = farm.getBlockMeta(checkBlock); + block = checkBlock.getBlock(farm.getWorldObj()); + if(super.canHarvest(farm, checkBlock, block, meta)) { + return true; + } + checkBlock = checkBlock.getLocation(ForgeDirection.UP); + } + + return false; } } \ No newline at end of file