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

Fixed disabled conflicts

Browse Source
This commit is contained in:
Auxilor
2020-10-18 11:01:40 +01:00
parent e5a24d1df2
commit 5322ea17b2
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEnchantinfo.java
View File

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