summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfeildmaster <admin@feildmaster.com>2012-08-14 18:28:00 -0500
committerfeildmaster <admin@feildmaster.com>2012-08-15 06:00:55 -0500
commitfc35d000e4176844ad3b9c2ed4fb2a901d2718ed (patch)
tree4d4dc2081cfcf36091ca95afed1209744aeb5f3d
parentb059962a5c682d1e5d994639b4273a2d4294d82a (diff)
downloadcraftbukkit-fc35d000e4176844ad3b9c2ed4fb2a901d2718ed.tar
craftbukkit-fc35d000e4176844ad3b9c2ed4fb2a901d2718ed.tar.gz
craftbukkit-fc35d000e4176844ad3b9c2ed4fb2a901d2718ed.tar.lz
craftbukkit-fc35d000e4176844ad3b9c2ed4fb2a901d2718ed.tar.xz
craftbukkit-fc35d000e4176844ad3b9c2ed4fb2a901d2718ed.zip
Use correct SlotType's for merchants. Fixes BUKKIT-2257
-rw-r--r--src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java
index 95eb6163..61e83a84 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java
@@ -102,6 +102,13 @@ public class CraftInventoryView extends InventoryView {
type = SlotType.CRAFTING;
}
break;
+ case MERCHANT:
+ if (slot == 2) {
+ type = SlotType.RESULT;
+ } else {
+ type = SlotType.CRAFTING;
+ }
+ break;
default:
// Nothing to do, it's a CONTAINER slot
}