Upstream/Auction-House
1
0
Fork 0
mirror of https://github.com/kiranhart/Auction-House.git synced 2024-11-23 05:35:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix custom texture head issue

Browse Source 
Took 7 minutes
This commit is contained in:
Kiran Hart 2022-09-19 16:13:39 -04:00
parent f9f10b4a38
commit f677e7d5fc
No known key found for this signature in database
GPG Key ID: 5F36C7BC79D3EBC3
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/ca/tweetzy/auctionhouse/api/AuctionAPI.java
View File

@ -494,7 +494,14 @@ public class AuctionAPI {
if (stack.getType() == XMaterial.PLAYER_HEAD.parseMaterial()) {
for (ItemStack item : player.getInventory().getContents()) {
if (item == null || item.getType() != XMaterial.PLAYER_HEAD.parseMaterial()) continue;
if (NBTEditor.getTexture(item).equals(NBTEditor.getTexture(stack))) total += item.getAmount();
if (NBTEditor.getTexture(item).equals(NBTEditor.getTexture(stack))) {
final String invItemTexture = NBTEditor.getTexture(item);
final String orgItemTexture = NBTEditor.getTexture(stack);
if (invItemTexture == null) continue;
if (orgItemTexture == null) continue;
total += item.getAmount();
}
}
} else {
for (ItemStack item : player.getInventory().getContents()) {
@ -542,7 +549,23 @@ public class AuctionAPI {
ItemStack item = player.getInventory().getItem(j);
if (item == null) continue;
if (stack.getType() == XMaterial.PLAYER_HEAD.parseMaterial() && item.getType() == XMaterial.PLAYER_HEAD.parseMaterial()) {
if (!NBTEditor.getTexture(item).equals(NBTEditor.getTexture(stack))) continue;
// is actual player head???
SkullMeta invItemMeta = (SkullMeta) item.getItemMeta();
SkullMeta orgItemMeta = (SkullMeta) stack.getItemMeta();
if (invItemMeta != null && orgItemMeta != null && invItemMeta.hasOwner() && orgItemMeta.hasOwner()) {
if (!invItemMeta.getOwner().equalsIgnoreCase(orgItemMeta.getOwner())) continue;
} else {
final String invItemTexture = NBTEditor.getTexture(item);
final String orgItemTexture = NBTEditor.getTexture(stack);
if (invItemTexture == null) continue;
if (orgItemTexture == null) continue;
if (!NBTEditor.getTexture(item).equals(NBTEditor.getTexture(stack))) continue;
}
} else {
if (!item.isSimilar(stack)) continue;