Upstream/VaultAPI
1
0
Fork 0
mirror of https://github.com/MilkBowl/VaultAPI.git synced 2024-11-25 03:45:12 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #41 from FlyingPikachu/master

Browse Source 
Correct itemByStack(), fixes #10 and #36
This commit is contained in:
Nick Minkler 2018-01-09 22:34:42 -08:00 committed by GitHub
commit bf98e28a93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -2,4 +2,5 @@
/dependency-reduced-pom.xml
/.classpath
/.project
/.settings
/.settings
/bin/

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

@ -817,10 +817,16 @@ public class Items {
}
for (ItemInfo item : items) {
if (itemStack.getType().equals(item.getType()) && item.isDurable()) {
return item;
} else if (itemStack.getType().equals(item.getType()) && item.getSubTypeId() == itemStack.getDurability()) {
return item;
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;
}
} else {
//Not solid, so ignore durability (Stick, Stone Button, et al.)
return item;
}
}
}