OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-02 13:07:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Change enchantment comparisons to isSimilar. Fixes BUKKIT-3183

Browse source 
The purpose of the isSimilar method was designed to consider all NBT
data, not solely enchantments, without the need to have exact stack
size matches. The respective methods in CraftInventory were still
comparing enchantments instead of the ItemMeta.
This commit is contained in:
Wesley Wolfe 2012-12-17 15:53:25 -06:00
parent d66d3674ea
commit 6cec8ba5cb
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
View file

@ -147,7 +147,7 @@ public class CraftInventory implements Inventory {
return true;
}
for (ItemStack i : getContents()) {
if (i != null && item.getTypeId() == i.getTypeId() && item.getDurability() == i.getDurability() && item.getEnchantments().equals(i.getEnchantments()) && (amount -= i.getAmount()) <= 0) {
if (item.isSimilar(i) && (amount -= i.getAmount()) <= 0) {
return true;
}
}
@ -213,15 +213,7 @@ public class CraftInventory implements Inventory {
for (int i = 0; i < inventory.length; i++) {
if (inventory[i] == null) continue;
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) {
if (withAmount ? item.equals(inventory[i]) : item.isSimilar(inventory[i])) {
return i;
}
}
@ -262,7 +254,7 @@ public class CraftInventory implements Inventory {
}
for (int i = 0; i < inventory.length; i++) {
ItemStack cItem = inventory[i];
if (cItem != null && cItem.getTypeId() == filteredItem.getTypeId() && cItem.getAmount() < cItem.getMaxStackSize() && cItem.getDurability() == filteredItem.getDurability() && cItem.getEnchantments().equals(filteredItem.getEnchantments())) {
if (cItem != null && cItem.getAmount() < cItem.getMaxStackSize() && cItem.isSimilar(filteredItem)) {
return i;
}
}