Repo-Mirror/EcoEnchants
9
0
Fork 0
Code Issues Releases 1 Activity

Fixed disabled enchantments

Browse Source
This commit is contained in:
Auxilor
2020-10-29 13:04:22 +00:00
parent 652fa757fa
commit 7eb30589fa
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java
View File

@@ -256,18 +256,28 @@ public final class EnchantDisplay {
enchantments = meta.getEnchants();
}
enchantments.forEach((enchantment, level) -> {
if(EcoEnchants.getFromEnchantment(enchantment) == null) return;
EcoEnchant ecoEnchant = EcoEnchants.getFromEnchantment(enchantment);
if(!ecoEnchant.isEnabled())
forRemoval.add(enchantment);
});
forRemoval.forEach(enchantments::remove);
if(meta instanceof EnchantmentStorageMeta) {
forRemoval.forEach(((EnchantmentStorageMeta) meta)::removeStoredEnchant);
} else {
forRemoval.forEach(meta::removeEnchant);
}
final ItemStack finalItem = item;
enchantments.forEach((enchantment, level) -> {
boolean isEcoEnchant = EcoEnchants.getFromEnchantment(enchantment) != null;
if(CACHE.get(enchantment) == null) return;
String name = CACHE.get(enchantment).getKey();
if(isEcoEnchant) {
if(!EcoEnchants.getFromEnchantment(enchantment).isEnabled()) forRemoval.add(enchantment);
}
if(!(enchantment.getMaxLevel() == 1 && level == 1)) {
if(useNumerals && finalItem.getEnchantmentLevel(enchantment) < numbersThreshold) {
name += " " + NumberUtils.toNumeral(level);
@@ -300,9 +310,6 @@ public final class EnchantDisplay {
if (meta instanceof EnchantmentStorageMeta) {
meta.addItemFlags(ItemFlag.HIDE_POTION_EFFECTS);
forRemoval.forEach(((EnchantmentStorageMeta) meta)::removeStoredEnchant);
} else {
forRemoval.forEach(meta::removeEnchant);
}
meta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
lore.addAll(itemLore);