Upstream
/
VaultAPI
mirror of https://github.com/MilkBowl/VaultAPI.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Correct itemByStack(), fixes #10 and #36

This commit is contained in:
HappyPikachu 2018-01-10 00:35:27 -05:00
parent 3d7d2de1d1
commit b305ed5f0b
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
/.classpath /.classpath
/.project /.project
/.settings /.settings
/bin/

10
src/main/java/net/milkbowl/vault/item/Items.java
View File

@ -817,12 +817,18 @@ public class Items {
} }
for (ItemInfo item : items) { for (ItemInfo item : items) {
if (itemStack.getType().equals(item.getType()) && item.isDurable()) { if (itemStack.getType().equals(item.getType())) {
if (itemStack.getType().isSolid() && item.getType().isSolid()) {
//Solid, so check durability (Podzol, Colored Wool, et al.)
if (item.isDurable()) {
return item; return item;
} else if (itemStack.getType().equals(item.getType()) && item.getSubTypeId() == itemStack.getDurability()) { }
} else {
//Not solid, so ignore durability (Stick, Stone Button, et al.)
return item; return item;
} }
} }
}
return null; return null;
} }