EpicKnarvik97/ArmoredElytra
EpicKnarvik97/ArmoredElytra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Add mutual check to enchant"

Browse Source 
This reverts commit 4c38eeb683.
This commit is contained in:
Brett Bonifas 2022-03-09 09:29:39 -05:00
parent 4c38eeb683
commit 79a820efc1
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/nl/pim16aap2/armoredElytra/nbtEditor/ArmoredElytraBuilder.java
View File

@ -8,12 +8,11 @@ import nl.pim16aap2.armoredElytra.util.Util;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Color; import org.bukkit.Color;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.LeatherArmorMeta; import org.bukkit.inventory.meta.LeatherArmorMeta;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.*; import java.util.List;
@SuppressWarnings({"unused", "UnusedReturnValue", "ClassCanBeRecord"}) @SuppressWarnings({"unused", "UnusedReturnValue", "ClassCanBeRecord"})
public class ArmoredElytraBuilder public class ArmoredElytraBuilder
@ -72,15 +71,7 @@ public class ArmoredElytraBuilder
final EnchantmentContainer enchantments = EnchantmentContainer.getEnchantments(sourceItem, plugin); final EnchantmentContainer enchantments = EnchantmentContainer.getEnchantments(sourceItem, plugin);
if (enchantments.isEmpty()) if (enchantments.isEmpty())
return null; return null;
// Check for mutually exclusive enchantments return newBuilder().ofElytra(armoredElytra).addEnchantments(enchantments).withName(name).build();
final Map<Enchantment, Integer> updatedEnchantments = new LinkedHashMap<>();
enchantments.forEach(enchantment -> updatedEnchantments.put(enchantment.getKey(), enchantment.getValue()));
for (Map.Entry<Enchantment, Integer> 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();
} }
/** /**