Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-17 17:31:06 +02:00
Code Issues Projects Releases Wiki Activity

CraftInventory.remove shouldn't care about amount (BUKKIT-138)

Browse Source
This commit is contained in:
Nathan Adams 2011-12-05 01:51:33 +00:00
parent dbd3ff71fc
commit 8363eadcab
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
View File

@ -160,12 +160,24 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
}
public int first(ItemStack item) {
return first(item, true);
}
public int first(ItemStack item, boolean withAmount) {
if (item == null) {
return -1;
}
ItemStack[] inventory = getContents();
for (int i = 0; i < inventory.length; i++) {
if (item.equals(inventory[i])) {
boolean equals = false;
if (withAmount) {
equals = item.equals(inventory[i]);
} else {
equals = item.getTypeId() == inventory[i].getTypeId() && item.getDurability() == inventory[i].getDurability() && item.getEnchantments().equals(inventory[i].getEnchantments());
}
if (equals) {
return i;
}
}
@ -282,7 +294,7 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
int toDelete = item.getAmount();
while (true) {
int first = first(item);
int first = first(item, false);
// Drat! we don't have this type in the inventory
if (first == -1) {