diff options
Diffstat (limited to 'nms-patches/BlockSapling.patch')
| -rw-r--r-- | nms-patches/BlockSapling.patch | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/nms-patches/BlockSapling.patch b/nms-patches/BlockSapling.patch index 2b65eaf1..366e3614 100644 --- a/nms-patches/BlockSapling.patch +++ b/nms-patches/BlockSapling.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/BlockSapling.java 2014-11-28 17:43:42.957707438 +0000 -+++ src/main/java/net/minecraft/server/BlockSapling.java 2014-11-28 17:38:17.000000000 +0000 +--- /home/matt/mc-dev-private//net/minecraft/server/BlockSapling.java 2015-02-26 22:40:22.243608143 +0000 ++++ src/main/java/net/minecraft/server/BlockSapling.java 2015-02-26 22:40:22.247608143 +0000 @@ -2,10 +2,20 @@ import java.util.Random; @@ -15,14 +15,14 @@ + public class BlockSapling extends BlockPlant implements IBlockFragilePlantElement { - public static final BlockStateEnum TYPE = BlockStateEnum.of("type", EnumLogVariant.class); + public static final BlockStateEnum<BlockWood.EnumLogVariant> TYPE = BlockStateEnum.of("type", BlockWood.EnumLogVariant.class); public static final BlockStateInteger STAGE = BlockStateInteger.of("stage", 0, 1); + public static TreeType treeType; // CraftBukkit protected BlockSapling() { - this.j(this.blockStateList.getBlockData().set(BlockSapling.TYPE, EnumLogVariant.OAK).set(BlockSapling.STAGE, Integer.valueOf(0))); -@@ -19,7 +29,30 @@ - if (!world.isStatic) { + this.j(this.blockStateList.getBlockData().set(BlockSapling.TYPE, BlockWood.EnumLogVariant.OAK).set(BlockSapling.STAGE, Integer.valueOf(0))); +@@ -23,7 +33,30 @@ + if (!world.isClientSide) { super.b(world, blockposition, iblockdata, random); if (world.getLightLevel(blockposition.up()) >= 9 && random.nextInt(7) == 0) { + // CraftBukkit start @@ -52,7 +52,7 @@ } } -@@ -35,7 +68,17 @@ +@@ -39,7 +72,17 @@ } public void e(World world, BlockPosition blockposition, IBlockData iblockdata, Random random) { @@ -71,15 +71,15 @@ int i = 0; int j = 0; boolean flag = false; -@@ -46,6 +89,7 @@ +@@ -51,6 +94,7 @@ for (i = 0; i >= -1; --i) { for (j = 0; j >= -1; --j) { - if (this.a(world, blockposition.a(i, 0, j), EnumLogVariant.SPRUCE) && this.a(world, blockposition.a(i + 1, 0, j), EnumLogVariant.SPRUCE) && this.a(world, blockposition.a(i, 0, j + 1), EnumLogVariant.SPRUCE) && this.a(world, blockposition.a(i + 1, 0, j + 1), EnumLogVariant.SPRUCE)) { + if (this.a(world, blockposition, i, j, BlockWood.EnumLogVariant.SPRUCE)) { + treeType = TreeType.MEGA_REDWOOD; // CraftBukkit object = new WorldGenMegaTree(false, random.nextBoolean()); flag = true; - break label78; -@@ -56,11 +100,13 @@ + break label66; +@@ -61,11 +105,13 @@ if (!flag) { j = 0; i = 0; @@ -93,33 +93,33 @@ object = new WorldGenForest(true, false); break; -@@ -69,6 +115,7 @@ +@@ -77,6 +123,7 @@ for (i = 0; i >= -1; --i) { for (j = 0; j >= -1; --j) { - if (this.a(world, blockposition.a(i, 0, j), EnumLogVariant.JUNGLE) && this.a(world, blockposition.a(i + 1, 0, j), EnumLogVariant.JUNGLE) && this.a(world, blockposition.a(i, 0, j + 1), EnumLogVariant.JUNGLE) && this.a(world, blockposition.a(i + 1, 0, j + 1), EnumLogVariant.JUNGLE)) { + if (this.a(world, blockposition, i, j, BlockWood.EnumLogVariant.JUNGLE)) { + treeType = TreeType.JUNGLE; // CraftBukkit - object = new WorldGenJungleTree(true, 10, 20, EnumLogVariant.JUNGLE.a(), EnumLogVariant.JUNGLE.a()); + object = new WorldGenJungleTree(true, 10, 20, iblockdata1, iblockdata2); flag = true; - break label93; -@@ -79,11 +126,13 @@ + break label78; +@@ -87,11 +134,13 @@ if (!flag) { j = 0; i = 0; + treeType = TreeType.SMALL_JUNGLE; // CraftBukkit - object = new WorldGenTrees(true, 4 + random.nextInt(7), EnumLogVariant.JUNGLE.a(), EnumLogVariant.JUNGLE.a(), false); + object = new WorldGenTrees(true, 4 + random.nextInt(7), iblockdata1, iblockdata2, false); } break; case 4: -+ treeType = TreeType.ACACIA; // CraftBukki ++ treeType = TreeType.ACACIA; // CraftBukkit object = new WorldGenAcaciaTree(true); break; -@@ -92,6 +141,7 @@ +@@ -100,6 +149,7 @@ for (i = 0; i >= -1; --i) { for (j = 0; j >= -1; --j) { - if (this.a(world, blockposition.a(i, 0, j), EnumLogVariant.DARK_OAK) && this.a(world, blockposition.a(i + 1, 0, j), EnumLogVariant.DARK_OAK) && this.a(world, blockposition.a(i, 0, j + 1), EnumLogVariant.DARK_OAK) && this.a(world, blockposition.a(i + 1, 0, j + 1), EnumLogVariant.DARK_OAK)) { + if (this.a(world, blockposition, i, j, BlockWood.EnumLogVariant.DARK_OAK)) { + treeType = TreeType.DARK_OAK; // CraftBukkit object = new WorldGenForestTree(true); flag = true; - break label108; + break label90; |