mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity

Make requested changes, made combineEnchantments better generally

Browse Source
This commit is contained in:
ProfElements 2021-01-13 14:35:17 -06:00
parent 93997718c0
commit 088a08952b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/BookBinder.java
View File

@ -3,6 +3,7 @@ package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machine
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import javax.annotation.ParametersAreNonnullByDefault; import javax.annotation.ParametersAreNonnullByDefault;
@ -108,6 +109,8 @@ public class BookBinder extends AContainer {
return "BOOK_BINDER"; return "BOOK_BINDER";
} }
@Nonnull
@ParametersAreNonnullByDefault
private Map<Enchantment, Integer> combineEnchantments(Map<Enchantment, Integer> ech1, Map<Enchantment, Integer> ech2) { private Map<Enchantment, Integer> combineEnchantments(Map<Enchantment, Integer> ech1, Map<Enchantment, Integer> ech2) {
Map<Enchantment, Integer> enchantments = new HashMap<>(); Map<Enchantment, Integer> enchantments = new HashMap<>();
@ -122,10 +125,12 @@ public class BookBinder extends AContainer {
} }
} else { } else {
int highestLevel = Math.max(a, b);
if (hasCustomMaxLevel.getValue()) { if (hasCustomMaxLevel.getValue()) {
return Math.max(a, b) > customMaxLevel.getValue() ? customMaxLevel.getValue() : Math.max(a, b); return highestLevel > customMaxLevel.getValue() ? customMaxLevel.getValue() : highestLevel;
} else { } else {
return Math.max(a, b); return highestLevel;
} }
} }