diff options
| author | Celtic Minstrel <celtic.minstrel.ca@some.place> | 2012-03-13 20:33:43 -0400 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2012-03-15 23:24:54 -0400 |
| commit | db5f80448243809986a4f06eb611d87dd7f7fc55 (patch) | |
| tree | 6ea021b471d7a47a5a0eb9c764b7e96fa86b84e9 /src/main/java | |
| parent | f7da5d2ad7e6266732b4b0eead7f4169ce52dd93 (diff) | |
| download | craftbukkit-db5f80448243809986a4f06eb611d87dd7f7fc55.tar craftbukkit-db5f80448243809986a4f06eb611d87dd7f7fc55.tar.gz craftbukkit-db5f80448243809986a4f06eb611d87dd7f7fc55.tar.lz craftbukkit-db5f80448243809986a4f06eb611d87dd7f7fc55.tar.xz craftbukkit-db5f80448243809986a4f06eb611d87dd7f7fc55.zip | |
[Bleeding] Check top inventory type when determining whether a click event is a craft event. Fixes BUKKIT-1112
- Credit to Taufiq Hoven for locating the root cause of the issue.
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/net/minecraft/server/NetServerHandler.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java index 18293eb7..58724a31 100644 --- a/src/main/java/net/minecraft/server/NetServerHandler.java +++ b/src/main/java/net/minecraft/server/NetServerHandler.java @@ -1147,8 +1147,8 @@ public class NetServerHandler extends NetHandler implements ICommandListener { SlotType type = CraftInventoryView.getSlotType(inventory, packet102windowclick.slot); InventoryClickEvent event; - if (inventory instanceof CraftingInventory) { - Recipe recipe = ((CraftingInventory)inventory.getTopInventory()).getRecipe(); + if (packet102windowclick.slot == 0 && inventory.getTopInventory() instanceof CraftingInventory) { + Recipe recipe = ((CraftingInventory) inventory.getTopInventory()).getRecipe(); event = new CraftItemEvent(recipe, inventory, type, packet102windowclick.slot, packet102windowclick.button != 0, packet102windowclick.shift); } else { event = new InventoryClickEvent(inventory, type, packet102windowclick.slot, packet102windowclick.button != 0, packet102windowclick.shift); |