diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEnchantinfo.java b/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEnchantinfo.java index 6588e056..e0f52dd8 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEnchantinfo.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEnchantinfo.java @@ -54,8 +54,10 @@ public final class CommandEnchantinfo extends AbstractCommand { Set conflicts = enchantment.getConflicts(); + conflicts.removeIf(enchant -> (EcoEnchants.getFromEnchantment(enchant) != null) && !EcoEnchants.getFromEnchantment(enchantment).isEnabled()); + conflicts.forEach((enchantment1 -> { - if(EcoEnchants.getFromEnchantment(enchantment1) != null && EcoEnchants.getFromEnchantment(enchantment).isEnabled()) { + if(EcoEnchants.getFromEnchantment(enchantment1) != null) { conflictNames.add(EcoEnchants.getFromEnchantment(enchantment1).getName()); } else { conflictNames.add(ConfigManager.getLang().getString("enchantments." + enchantment1.getKey().getKey() + ".name"));