Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-16 13:21:24 +01:00
Code Issues Projects Releases Wiki Activity

Inventory#removeItemAnySlot

Browse Source
This commit is contained in:
Zach Brown 2018-08-28 23:04:15 -04:00
parent bfd8b7bcef
commit 48707f87ac
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
View File

@ -224,10 +224,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 = this.getStorageContents();
// ItemStack[] inventory = this.getStorageContents(); // Paper - let param deal
for (int i = 0; i < inventory.length; i++) {
if (inventory[i] == null) continue;
@ -339,6 +345,17 @@ public class CraftInventory implements Inventory {
@Override
public HashMap<Integer, ItemStack> removeItem(ItemStack... items) {
// Paper start
return removeItem(false, items);
}
@Override
public HashMap<Integer, ItemStack> removeItemAnySlot(ItemStack... items) {
return removeItem(true, items);
}
private HashMap<Integer, ItemStack> removeItem(boolean searchEntire, ItemStack... items) {
// Paper end
Preconditions.checkArgument(items != null, "items cannot be null");
HashMap<Integer, ItemStack> leftover = new HashMap<Integer, ItemStack>();
@ -350,7 +367,10 @@ public class CraftInventory implements Inventory {
int toDelete = item.getAmount();
while (true) {
int first = this.first(item, false);
// Paper start - Allow searching entire contents
ItemStack[] toSearch = searchEntire ? getContents() : getStorageContents();
int first = this.first(item, false, toSearch);
// Paper end
// Drat! we don't have this type in the inventory
if (first == -1) {