From d8a9c7be4227b2243968b63ab7cc7a00098c93ad Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 26 Feb 2015 22:41:06 +0000 Subject: Update to Minecraft 1.8.3 --- nms-patches/BlockStem.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'nms-patches/BlockStem.patch') diff --git a/nms-patches/BlockStem.patch b/nms-patches/BlockStem.patch index 5db91d75..4f65887f 100644 --- a/nms-patches/BlockStem.patch +++ b/nms-patches/BlockStem.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/BlockStem.java 2014-11-28 17:43:42.969707438 +0000 -+++ src/main/java/net/minecraft/server/BlockStem.java 2014-11-28 17:38:21.000000000 +0000 +--- /home/matt/mc-dev-private//net/minecraft/server/BlockStem.java 2015-02-26 22:40:22.271608143 +0000 ++++ src/main/java/net/minecraft/server/BlockStem.java 2015-02-26 22:40:22.271608143 +0000 @@ -4,6 +4,8 @@ import java.util.Iterator; import java.util.Random; @@ -9,7 +9,7 @@ public class BlockStem extends BlockPlant implements IBlockFragilePlantElement { public static final BlockStateInteger AGE = BlockStateInteger.of("age", 0, 7); -@@ -50,7 +52,8 @@ +@@ -58,7 +60,8 @@ if (i < 7) { iblockdata = iblockdata.set(BlockStem.AGE, Integer.valueOf(i + 1)); @@ -17,9 +17,9 @@ + // world.setTypeAndData(blockposition, iblockdata, 2); // CraftBukkit + CraftEventFactory.handleBlockGrowEvent(world, blockposition.getX(), blockposition.getY(), blockposition.getZ(), this, toLegacyData(iblockdata)); // CraftBukkit } else { - Iterator iterator = EnumDirectionLimit.HORIZONTAL.iterator(); + Iterator iterator = EnumDirection.EnumDirectionLimit.HORIZONTAL.iterator(); -@@ -66,7 +69,8 @@ +@@ -74,7 +77,8 @@ Block block = world.getType(blockposition.down()).getBlock(); if (world.getType(blockposition).getBlock().material == Material.AIR && (block == Blocks.FARMLAND || block == Blocks.DIRT || block == Blocks.GRASS)) { @@ -29,7 +29,7 @@ } } } -@@ -77,7 +81,8 @@ +@@ -85,7 +89,8 @@ public void g(World world, BlockPosition blockposition, IBlockData iblockdata) { int i = ((Integer) iblockdata.get(BlockStem.AGE)).intValue() + MathHelper.nextInt(world.random, 2, 5); @@ -38,4 +38,4 @@ + CraftEventFactory.handleBlockGrowEvent(world, blockposition.getX(), blockposition.getY(), blockposition.getZ(), this, Math.min(7, i)); // CraftBukkit } - public void h() { + public void j() { -- cgit v1.2.3