SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Aktivität

Change enchantment comparisons to isSimilar. Fixes BUKKIT-3183

Quellcode durchsuchen 
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.

By: Wesley Wolfe <weswolf@aol.com>
Dieser Commit ist enthalten in:
CraftBukkit/Spigot 2012-12-17 15:53:25 -06:00
Ursprung 9aa9b8775a
Commit a885a5f0ee
1 geänderte Dateien mit 3 neuen und 11 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

14
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
Datei anzeigen

@ -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;
}
}