From 2b2d084ac9b0782007e3f4fac6024911ae606b76 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 26 Dec 2018 10:40:14 +1100
Subject: [PATCH] Add InventoryView#getSlotType

---
 nms-patches/PlayerConnection.patch            |  2 +-
 .../inventory/CraftInventoryView.java         | 67 -------------------
 2 files changed, 1 insertion(+), 68 deletions(-)

diff --git a/nms-patches/PlayerConnection.patch b/nms-patches/PlayerConnection.patch
index d2e8a7a617..3e551482ce 100644
--- a/nms-patches/PlayerConnection.patch
+++ b/nms-patches/PlayerConnection.patch
@@ -1230,7 +1230,7 @@
 +                }
 +
 +                InventoryView inventory = this.player.activeContainer.getBukkitView();
-+                SlotType type = CraftInventoryView.getSlotType(inventory, packetplayinwindowclick.c());
++                SlotType type = inventory.getSlotType(packetplayinwindowclick.c());
  
 +                InventoryClickEvent event;
 +                ClickType click = ClickType.UNKNOWN;
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java
index ed57a7e2a9..ac23350917 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java
@@ -72,71 +72,4 @@ public class CraftInventoryView extends InventoryView {
     public Container getHandle() {
         return container;
     }
-
-    public static SlotType getSlotType(InventoryView inventory, int slot) {
-        SlotType type = SlotType.CONTAINER;
-        if (slot >= 0 && slot < inventory.getTopInventory().getSize()) {
-            switch(inventory.getType()) {
-            case FURNACE:
-                if (slot == 2) {
-                    type = SlotType.RESULT;
-                } else if(slot == 1) {
-                    type = SlotType.FUEL;
-                } else {
-                    type = SlotType.CRAFTING;
-                }
-                break;
-            case BREWING:
-                if (slot == 3) {
-                    type = SlotType.FUEL;
-                } else {
-                    type = SlotType.CRAFTING;
-                }
-                break;
-            case ENCHANTING:
-                type = SlotType.CRAFTING;
-                break;
-            case WORKBENCH:
-            case CRAFTING:
-                if (slot == 0) {
-                    type = SlotType.RESULT;
-                } else {
-                    type = SlotType.CRAFTING;
-                }
-                break;
-            case MERCHANT:
-                if (slot == 2) {
-                    type = SlotType.RESULT;
-                } else {
-                    type = SlotType.CRAFTING;
-                }
-                break;
-            case BEACON:
-                type = SlotType.CRAFTING;
-                break;
-            case ANVIL:
-                if (slot == 2) {
-                    type = SlotType.RESULT;
-                } else {
-                    type = SlotType.CRAFTING;
-                }
-                break;
-            default:
-                // Nothing to do, it's a CONTAINER slot
-            }
-        } else {
-            if (slot < 0) {
-                type = SlotType.OUTSIDE;
-            } else if (inventory.getType() == InventoryType.CRAFTING) { // Also includes creative inventory
-                if (slot < 9) {
-                    type = SlotType.ARMOR;
-                } else if (slot > 35) {
-                    type = SlotType.QUICKBAR;
-                }
-            } else if (slot >= (inventory.countSlots() - (9 + 4 + 1))) { // Quickbar, Armor, Offhand
-                type = SlotType.QUICKBAR;
-            }
-        }
-        return type;
-    }
 }