keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Remove outdated patch to BlockDoublePlant

Browse source
This commit is contained in:
Vincent Lee 2017-03-16 20:55:50 -05:00 committed by mezz
parent c5ffe46f48
commit a480fa0821
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
patches/minecraft/net/minecraft/block/BlockDoublePlant.java.patch
View file

@ -59,7 +59,7 @@
public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_) public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
{ {
for (BlockDoublePlant.EnumPlantType blockdoubleplant$enumplanttype : BlockDoublePlant.EnumPlantType.values()) for (BlockDoublePlant.EnumPlantType blockdoubleplant$enumplanttype : BlockDoublePlant.EnumPlantType.values())
@@ -293,6 +287,33 @@ @@ -293,6 +287,24 @@
return Block.EnumOffsetType.XZ; 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())); + if (type == EnumPlantType.GRASS) ret.add(new ItemStack(Blocks.field_150329_H, 2, BlockTallGrass.EnumType.GRASS.func_177044_a()));
+ return ret; + 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 public static enum EnumBlockHalf implements IStringSerializable
{ {