From 5322ea17b29ee28656974bcfaa28113850a0650e Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Sun, 18 Oct 2020 11:01:40 +0100
Subject: [PATCH] Fixed disabled conflicts

---
 .../ecoenchants/command/commands/CommandEnchantinfo.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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<Enchantment> 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"));