summaryrefslogtreecommitdiffstats
path: root/nms-patches/BlockReed.patch
diff options
context:
space:
mode:
authorThinkofdeath <thinkofdeath@spigotmc.org>2014-12-11 00:13:27 +0000
committerThinkofdeath <thinkofdeath@spigotmc.org>2014-12-11 00:13:27 +0000
commitd5c9a3c990f79121ba9b10f6839ae606dd67da6a (patch)
tree59c83bc515d4e7e405228b37236bebae8d99b892 /nms-patches/BlockReed.patch
parentf48410a39c98aa5a25f243877e2aa47357d46afc (diff)
downloadcraftbukkit-d5c9a3c990f79121ba9b10f6839ae606dd67da6a.tar
craftbukkit-d5c9a3c990f79121ba9b10f6839ae606dd67da6a.tar.gz
craftbukkit-d5c9a3c990f79121ba9b10f6839ae606dd67da6a.tar.lz
craftbukkit-d5c9a3c990f79121ba9b10f6839ae606dd67da6a.tar.xz
craftbukkit-d5c9a3c990f79121ba9b10f6839ae606dd67da6a.zip
SPIGOT-179: Fix the age counter not being reset for cacti and reeds
Diffstat (limited to 'nms-patches/BlockReed.patch')
-rw-r--r--nms-patches/BlockReed.patch9
1 files changed, 4 insertions, 5 deletions
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 {