From e7c1c4daa76270e2e084477d2143aa3d76f9f108 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 28 Aug 2018 23:04:15 -0400 Subject: [PATCH] Inventory#removeItemAnySlot diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java index dd7b3d766f..01af982933 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java @@ -213,10 +213,16 @@ public class CraftInventory implements Inventory { } private int first(ItemStack item, boolean withAmount) { + // Paper start + return first(item, withAmount, getStorageContents()); + } + + private int first(ItemStack item, boolean withAmount, ItemStack[] inventory) { + // Paper end if (item == null) { return -1; } - ItemStack[] inventory = getStorageContents(); + //ItemStack[] inventory = getStorageContents(); // Paper - let param deal for (int i = 0; i < inventory.length; i++) { if (inventory[i] == null) continue; @@ -331,6 +337,17 @@ public class CraftInventory implements Inventory { } public HashMap removeItem(ItemStack... items) { + // Paper start + return removeItem(false, items); + } + + @Override + public HashMap removeItemAnySlot(ItemStack... items) { + return removeItem(true, items); + } + + private HashMap removeItem(boolean searchEntire, ItemStack... items) { + // Paper end Validate.notNull(items, "Items cannot be null"); HashMap leftover = new HashMap(); @@ -341,7 +358,10 @@ public class CraftInventory implements Inventory { int toDelete = item.getAmount(); while (true) { - int first = first(item, false); + // Paper start - Allow searching entire contents + ItemStack[] toSearch = searchEntire ? getContents() : getStorageContents(); + int first = first(item, false, toSearch); + // Paper end // Drat! we don't have this type in the inventory if (first == -1) { -- 2.19.0