From a4fe7cd3c4a4f04d67c12e0addb20c2acd146273 Mon Sep 17 00:00:00 2001 From: GJ Date: Mon, 10 Feb 2014 12:12:39 -0500 Subject: [PATCH] [Bleeding] Return correct player SlotType. Fixes BUKKIT-3188 Previously, the SlotType for the last 4 slots in a player's inventory returned QUICKBAR when it should have returned SlotType.CONTAINER. This updates the code for determining slot type to return the proper value. --- .../bukkit/craftbukkit/inventory/CraftInventoryView.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java index 8925e601cd..ae47a0ed4d 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java @@ -127,8 +127,12 @@ public class CraftInventoryView extends InventoryView { } else { if (slot == -999) { type = SlotType.OUTSIDE; - } else if (inventory.getType() == InventoryType.CRAFTING && slot < 9) { - type = SlotType.ARMOR; + } else if (inventory.getType() == InventoryType.CRAFTING) { + if (slot < 9) { + type = SlotType.ARMOR; + } else if (slot > 35) { + type = SlotType.QUICKBAR; + } } else if (slot >= (inventory.countSlots() - 9)) { type = SlotType.QUICKBAR; }