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

Make combined final again (minimizing diff)

Browse Source
This commit is contained in:
Brett Bonifas
2022-03-09 10:31:46 -05:00
parent 40dbb27c58
commit f4cfdcd227
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -202,7 +202,7 @@ public class EnchantmentContainer implements Iterable<Map.Entry<Enchantment, Int
if (first == null || first.isEmpty()) if (first == null || first.isEmpty())
return second; return second;
Map<Enchantment, Integer> combined = new HashMap<>(first); 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 mutually exclusive enchantment (giving second entry priority) // Check for mutually exclusive enchantment (giving second entry priority)