From 0920b554f4e0464aafa1e848707831557bb63b74 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 2 Mar 2013 09:47:17 +1100 Subject: [PATCH] Pull CraftBukkit #1043 by @YLivay - addresses incorrect info returned to plugins in the dispense event. --- ...wrong-block-in-BlockDispenseEvent-wh.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 CraftBukkit-Patches/0039-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch diff --git a/CraftBukkit-Patches/0039-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch b/CraftBukkit-Patches/0039-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch new file mode 100644 index 000000000..172877424 --- /dev/null +++ b/CraftBukkit-Patches/0039-BUKKIT-3668-Fix-wrong-block-in-BlockDispenseEvent-wh.patch @@ -0,0 +1,26 @@ +From 2f89c4cf0ded941f290952d99a30c8a8e79f0d0c Mon Sep 17 00:00:00 2001 +From: Yariv Livay +Date: Tue, 26 Feb 2013 20:14:34 +0200 +Subject: [PATCH] BUKKIT-3668 Fix wrong block in BlockDispenseEvent when + filling empty bucket + +--- + src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java b/src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java +index b381e22..0df0669 100644 +--- a/src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java ++++ b/src/main/java/net/minecraft/server/DispenseBehaviorEmptyBucket.java +@@ -37,7 +37,7 @@ public class DispenseBehaviorEmptyBucket extends DispenseBehaviorItem { + } + + // CraftBukkit start +- org.bukkit.block.Block block = world.getWorld().getBlockAt(i, j, k); ++ org.bukkit.block.Block block = world.getWorld().getBlockAt(isourceblock.getBlockX(), j, isourceblock.getBlockZ()); + CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack); + + BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(0, 0, 0)); +-- +1.8.1-rc2 +