From 61b8616008c9defd1cf1803a1e126387d1f96247 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 8 Jan 2016 20:34:55 -0600 Subject: [PATCH] Fix double flowers not dropping from both halves. Closes #24 --- .../botania/common/block/BlockModDoubleFlower.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 5aeb178c9..3ce73dbac 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -52,7 +52,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -// Lots of copy paste from BlockDoublePlant because we can no longer extend it in 1.8.x public abstract class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconable { private static final int COUNT = 8; @@ -181,10 +180,17 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I @Override public List onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) { ArrayList ret = new ArrayList(); - if (world.getBlockState(pos.down()).getBlock() == this - && world.getBlockState(pos.down()).getValue(HALF) == EnumBlockHalf.LOWER) { + IBlockState state = world.getBlockState(pos); + IBlockState stateBelow = world.getBlockState(pos.down()); + + if (stateBelow.getBlock() == this && stateBelow.getValue(HALF) == EnumBlockHalf.LOWER && state.getValue(HALF) == EnumBlockHalf.UPPER) { ret.add(new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos.down())))); } + + if (state.getValue(HALF) == EnumBlockHalf.LOWER) { + ret.add(new ItemStack(this, 1, getMetaFromState(state))); + } + return ret; }