From 0f552845d08e4bb22edb771ac0dbfbede76758af Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sat, 29 Nov 2014 22:31:55 +0000 Subject: [PATCH] Treat LeavesDecayEvent as canceled if a plugin changes the block --- nms-patches/BlockLeaves.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nms-patches/BlockLeaves.patch b/nms-patches/BlockLeaves.patch index 78afcf0bbb..be0e66aa31 100644 --- a/nms-patches/BlockLeaves.patch +++ b/nms-patches/BlockLeaves.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/BlockLeaves.java 2014-11-28 17:43:42.913707439 +0000 -+++ src/main/java/net/minecraft/server/BlockLeaves.java 2014-11-28 17:38:22.000000000 +0000 +--- ../work/decompile-8eb82bde//net/minecraft/server/BlockLeaves.java 2014-11-29 22:31:45.788917956 +0000 ++++ src/main/java/net/minecraft/server/BlockLeaves.java 2014-11-29 22:27:58.604922998 +0000 @@ -2,6 +2,8 @@ import java.util.Random; @@ -17,7 +17,7 @@ + LeavesDecayEvent event = new LeavesDecayEvent(world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ())); + world.getServer().getPluginManager().callEvent(event); + -+ if (event.isCancelled()) { ++ if (event.isCancelled() || world.getType(blockposition).getBlock() != this) { + return; + } + // CraftBukkit end