From d5c9a3c990f79121ba9b10f6839ae606dd67da6a Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 11 Dec 2014 00:13:27 +0000 Subject: SPIGOT-179: Fix the age counter not being reset for cacti and reeds --- nms-patches/BlockReed.patch | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'nms-patches/BlockReed.patch') diff --git a/nms-patches/BlockReed.patch b/nms-patches/BlockReed.patch index 1c2c5f28..1409d40a 100644 --- a/nms-patches/BlockReed.patch +++ b/nms-patches/BlockReed.patch @@ -1,16 +1,15 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/BlockReed.java 2014-11-28 17:43:42.957707438 +0000 -+++ src/main/java/net/minecraft/server/BlockReed.java 2014-11-28 17:38:18.000000000 +0000 +--- ../work/decompile-8eb82bde/net/minecraft/server/BlockReed.java 2014-12-11 00:12:28.088272530 +0000 ++++ src/main/java/net/minecraft/server/BlockReed.java 2014-12-11 00:10:59.832273488 +0000 @@ -29,8 +29,13 @@ int j = ((Integer) iblockdata.get(BlockReed.AGE)).intValue(); if (j == 15) { - world.setTypeUpdate(blockposition.up(), this.getBlockData()); -- world.setTypeAndData(blockposition, iblockdata.set(BlockReed.AGE, Integer.valueOf(0)), 4); + // CraftBukkit start + // world.setTypeUpdate(blockposition.up(), this.getBlockData()); -+ // world.setTypeAndData(blockposition, iblockdata.set(BlockReed.AGE, Integer.valueOf(0)), 4); + BlockPosition upPos = blockposition.up(); -+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, upPos.getX(), upPos.getY(), upPos.getZ(), this, 0); ++ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, upPos.getX(), upPos.getY(), upPos.getZ(), this, 0); + world.setTypeAndData(blockposition, iblockdata.set(BlockReed.AGE, Integer.valueOf(0)), 4); + // CraftBukkit end + } else { -- cgit v1.2.3