From a480fa0821da4a943162d4971293d8ab63faed61 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 16 Mar 2017 20:55:50 -0500 Subject: [PATCH] Remove outdated patch to BlockDoublePlant --- .../net/minecraft/block/BlockDoublePlant.java.patch | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/patches/minecraft/net/minecraft/block/BlockDoublePlant.java.patch b/patches/minecraft/net/minecraft/block/BlockDoublePlant.java.patch index d8855a5900..3479ce07d7 100644 --- a/patches/minecraft/net/minecraft/block/BlockDoublePlant.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockDoublePlant.java.patch @@ -59,7 +59,7 @@ public void func_149666_a(CreativeTabs p_149666_1_, NonNullList p_149666_2_) { for (BlockDoublePlant.EnumPlantType blockdoubleplant$enumplanttype : BlockDoublePlant.EnumPlantType.values()) -@@ -293,6 +287,33 @@ +@@ -293,6 +287,24 @@ return Block.EnumOffsetType.XZ; } @@ -80,15 +80,6 @@ + if (type == EnumPlantType.GRASS) ret.add(new ItemStack(Blocks.field_150329_H, 2, BlockTallGrass.EnumType.GRASS.func_177044_a())); + return ret; + } -+ -+ @Override -+ public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) -+ { -+ //Forge: Break both parts on the client to prevent the top part flickering as default type for a few frames. -+ if (state.func_177230_c() == this && state.func_177229_b(field_176492_b) == EnumBlockHalf.LOWER && world.func_180495_p(pos.func_177984_a()).func_177230_c() == this) -+ world.func_175698_g(pos.func_177984_a()); -+ return world.func_175698_g(pos); -+ } + public static enum EnumBlockHalf implements IStringSerializable {