diff options
Diffstat (limited to 'nms-patches/BlockGrass.patch')
| -rw-r--r-- | nms-patches/BlockGrass.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nms-patches/BlockGrass.patch b/nms-patches/BlockGrass.patch index 7d6f07df..0e72746d 100644 --- a/nms-patches/BlockGrass.patch +++ b/nms-patches/BlockGrass.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/BlockGrass.java 2014-11-28 17:43:42.909707439 +0000 -+++ src/main/java/net/minecraft/server/BlockGrass.java 2014-11-28 17:38:17.000000000 +0000 +--- /home/matt/mc-dev-private//net/minecraft/server/BlockGrass.java 2015-02-26 22:40:22.147608144 +0000 ++++ src/main/java/net/minecraft/server/BlockGrass.java 2015-02-26 22:40:22.147608144 +0000 @@ -2,6 +2,14 @@ import java.util.Random; @@ -17,8 +17,8 @@ public static final BlockStateBoolean SNOWY = BlockStateBoolean.of("snowy"); @@ -22,7 +30,19 @@ public void b(World world, BlockPosition blockposition, IBlockData iblockdata, Random random) { - if (!world.isStatic) { - if (world.getLightLevel(blockposition.up()) < 4 && world.getType(blockposition.up()).getBlock().n() > 2) { + if (!world.isClientSide) { + if (world.getLightLevel(blockposition.up()) < 4 && world.getType(blockposition.up()).getBlock().p() > 2) { - world.setTypeUpdate(blockposition, Blocks.DIRT.getBlockData()); + // CraftBukkit start + // world.setTypeUpdate(blockposition, Blocks.DIRT.getBlockData()); @@ -39,7 +39,7 @@ @@ -31,7 +51,19 @@ IBlockData iblockdata1 = world.getType(blockposition1); - if (iblockdata1.getBlock() == Blocks.DIRT && iblockdata1.get(BlockDirt.VARIANT) == EnumDirtVariant.DIRT && world.getLightLevel(blockposition1.up()) >= 4 && block.n() <= 2) { + if (iblockdata1.getBlock() == Blocks.DIRT && iblockdata1.get(BlockDirt.VARIANT) == BlockDirt.EnumDirtVariant.DIRT && world.getLightLevel(blockposition1.up()) >= 4 && block.p() <= 2) { - world.setTypeUpdate(blockposition1, Blocks.GRASS.getBlockData()); + // CraftBukkit start + // world.setTypeUpdate(blockposition1, Blocks.GRASS.getBlockData()); @@ -58,7 +58,7 @@ } } @@ -74,13 +106,15 @@ - IBlockData iblockdata1 = blockflowers.getBlockData().set(blockflowers.l(), enumflowervarient); + IBlockData iblockdata1 = blockflowers.getBlockData().set(blockflowers.n(), blockflowers_enumflowervarient); if (blockflowers.f(world, blockposition2, iblockdata1)) { - world.setTypeAndData(blockposition2, iblockdata1, 3); @@ -66,11 +66,11 @@ + CraftEventFactory.handleBlockGrowEvent(world, blockposition2.getX(), blockposition2.getY(), blockposition2.getZ(), iblockdata1.getBlock(), iblockdata1.getBlock().toLegacyData(iblockdata1)); // CraftBukkit } } else { - IBlockData iblockdata2 = Blocks.TALLGRASS.getBlockData().set(BlockLongGrass.TYPE, EnumTallGrassType.GRASS); + IBlockData iblockdata2 = Blocks.TALLGRASS.getBlockData().set(BlockLongGrass.TYPE, BlockLongGrass.EnumTallGrassType.GRASS); if (Blocks.TALLGRASS.f(world, blockposition2, iblockdata2)) { - world.setTypeAndData(blockposition2, iblockdata2, 3); -+ // world.setTypeAndData(blockposition2, iblockdata2, 3); // CRaftBukkit ++ // world.setTypeAndData(blockposition2, iblockdata2, 3); // CraftBukkit + CraftEventFactory.handleBlockGrowEvent(world, blockposition2.getX(), blockposition2.getY(), blockposition2.getZ(), iblockdata2.getBlock(), iblockdata2.getBlock().toLegacyData(iblockdata2)); // CraftBukkit } } |