From 79a820efc17d19f4680c764b85927086b96a66d3 Mon Sep 17 00:00:00 2001 From: Brett Bonifas Date: Wed, 9 Mar 2022 09:29:39 -0500 Subject: [PATCH] Revert "Add mutual check to enchant" This reverts commit 4c38eeb68315ed03d333aa1ff5a1d21589efacb7. --- .../nbtEditor/ArmoredElytraBuilder.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/main/java/nl/pim16aap2/armoredElytra/nbtEditor/ArmoredElytraBuilder.java b/src/main/java/nl/pim16aap2/armoredElytra/nbtEditor/ArmoredElytraBuilder.java index 8c4b591..517f6d8 100644 --- a/src/main/java/nl/pim16aap2/armoredElytra/nbtEditor/ArmoredElytraBuilder.java +++ b/src/main/java/nl/pim16aap2/armoredElytra/nbtEditor/ArmoredElytraBuilder.java @@ -8,12 +8,11 @@ import nl.pim16aap2.armoredElytra.util.Util; import org.bukkit.Bukkit; import org.bukkit.Color; import org.bukkit.Material; -import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.LeatherArmorMeta; import javax.annotation.Nullable; -import java.util.*; +import java.util.List; @SuppressWarnings({"unused", "UnusedReturnValue", "ClassCanBeRecord"}) public class ArmoredElytraBuilder @@ -72,15 +71,7 @@ public class ArmoredElytraBuilder final EnchantmentContainer enchantments = EnchantmentContainer.getEnchantments(sourceItem, plugin); if (enchantments.isEmpty()) return null; - // Check for mutually exclusive enchantments - final Map updatedEnchantments = new LinkedHashMap<>(); - enchantments.forEach(enchantment -> updatedEnchantments.put(enchantment.getKey(), enchantment.getValue())); - for (Map.Entry elytraEnchantment : EnchantmentContainer.getEnchantments(armoredElytra, plugin)) - updatedEnchantments.keySet().removeIf(sourceEnchantment -> EnchantmentContainer.areMutuallyExclusive(sourceEnchantment, elytraEnchantment.getKey())); - if (updatedEnchantments.isEmpty()) - return null; - - return newBuilder().ofElytra(armoredElytra).addEnchantments(new EnchantmentContainer(updatedEnchantments, plugin)).withName(name).build(); + return newBuilder().ofElytra(armoredElytra).addEnchantments(enchantments).withName(name).build(); } /**