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

Enchanted books that are the same are now the same

This commit is contained in:
DaniFoldi 2021-02-15 13:04:45 +01:00
parent 0f66c4d2fd
commit ee867f3c5d
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/de/epiceric/shopchest/utils/Utils.java
View File

@ -23,6 +23,7 @@ import org.bukkit.block.Chest;
import org.bukkit.block.DoubleChest;
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
@ -30,6 +31,7 @@ import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
import org.bukkit.inventory.meta.BookMeta;
import org.bukkit.inventory.meta.EnchantmentStorageMeta;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.util.Vector;
@ -80,6 +82,36 @@ public class Utils {
itemStack2 = decode(encode(itemStack2));
}
if (itemMeta1 instanceof EnchantmentStorageMeta && itemMeta2 instanceof EnchantmentStorageMeta) {
EnchantmentStorageMeta book1 = (EnchantmentStorageMeta)itemMeta1;
EnchantmentStorageMeta book2 = (EnchantmentStorageMeta)itemMeta2;
if (book1.hasStoredEnchants() != book2.hasStoredEnchants()) {
return false;
}
for (Map.Entry<Enchantment, Integer> enchantment: book1.getStoredEnchants().entrySet()) {
if (!book2.hasStoredEnchant(enchantment.getKey())) {
return false;
}
if (book2.getStoredEnchantLevel(enchantment.getKey()) != enchantment.getValue()) {
return false;
}
}
//Cross-check for set equivalence
for (Map.Entry<Enchantment, Integer> enchantment: book2.getStoredEnchants().entrySet()) {
if (!book1.hasStoredEnchant(enchantment.getKey())) {
return false;
}
if (book1.getStoredEnchantLevel(enchantment.getKey()) != enchantment.getValue()) {
return false;
}
}
return true;
}
return itemStack1.isSimilar(itemStack2);
}