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

Re-Add mutually exclusive check to merge

Browse Source
This commit is contained in:
Brett Bonifas 2022-03-13 14:16:51 -04:00
parent 5fb902d46f
commit e679ca85fa
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/nl/pim16aap2/armoredElytra/util/EnchantmentContainer.java
View File

@ -219,7 +219,13 @@ public class EnchantmentContainer implements Iterable<Map.Entry<Enchantment, Int
if (first == null || first.isEmpty()) if (first == null || first.isEmpty())
return second; return second;
final Map<Enchantment, Integer> combined = new HashMap<>(); final List<Enchantment> blackList =
second.keySet().stream()
.flatMap(ench -> getMutuallyExclusiveEnchantments(ench).stream())
.toList();
blackList.forEach(first.keySet()::remove);
final Map<Enchantment, Integer> combined = new HashMap<>(first);
for (Map.Entry<Enchantment, Integer> entry : second.entrySet()) for (Map.Entry<Enchantment, Integer> entry : second.entrySet())
{ {
// Check for enchants with higher level // Check for enchants with higher level