Upstream
/
ChestShop-3
mirror of https://github.com/ChestShop-authors/ChestShop-3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Work around getItemMeta returning null in some cases (Fixes #432)

This commit is contained in:
Phoenix616 2021-04-12 16:08:03 +01:00
parent 0c51af6b45
commit 02cd9d4ec0
No known key found for this signature in database
GPG Key ID: 40E2321E71738EB0
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java
View File

@ -102,24 +102,41 @@ public class MaterialUtil {
if (!one.hasItemMeta() && !two.hasItemMeta()) {
return true;
}
Map<String, Object> oneSerMeta = one.getItemMeta().serialize();
Map<String, Object> twoSerMeta = two.getItemMeta().serialize();
ItemMeta oneMeta = one.getItemMeta();
ItemMeta twoMeta = two.getItemMeta();
// return true if both are null or same, false if only one is null
if (oneMeta == twoMeta || oneMeta == null || twoMeta == null) {
return oneMeta == twoMeta;
}
Map<String, Object> oneSerMeta = oneMeta.serialize();
Map<String, Object> twoSerMeta = twoMeta.serialize();
if (oneSerMeta.equals(twoSerMeta)) {
return true;
}
// Try to use same parsing as the YAML dumper in the ItemDatabase when generating the code as the last resort
ItemStack oneDumped = YAML.loadAs(YAML.dump(one), ItemStack.class);
if (oneDumped.isSimilar(two) || oneDumped.getItemMeta().serialize().equals(twoSerMeta)) {
if (oneDumped.isSimilar(two)) {
return true;
}
ItemMeta oneDumpedMeta = oneDumped.getItemMeta();
if (oneDumpedMeta != null && oneDumpedMeta.serialize().equals(twoSerMeta)) {
return true;
}
ItemStack twoDumped = YAML.loadAs(YAML.dump(two), ItemStack.class);
if (oneDumped.isSimilar(twoDumped) || oneDumped.getItemMeta().serialize().equals(twoDumped.getItemMeta().serialize())) {
if (oneDumped.isSimilar(twoDumped)) {
return true;
}
return false;
ItemMeta twoDumpedMeta = twoDumped.getItemMeta();
if (oneDumpedMeta != null && twoDumpedMeta != null && oneDumpedMeta.serialize().equals(twoDumpedMeta.serialize())) {
return true;
}
// return true if both are null or same, false otherwise
return oneDumpedMeta == twoDumpedMeta;
}
/**