From 088a08952bf3e794f3f90c7c09c2b3110f738bbb Mon Sep 17 00:00:00 2001 From: ProfElements Date: Wed, 13 Jan 2021 14:35:17 -0600 Subject: [PATCH] Make requested changes, made combineEnchantments better generally --- .../items/electric/machines/BookBinder.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/BookBinder.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/BookBinder.java index eb9bf8218..87b431f4a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/BookBinder.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/BookBinder.java @@ -3,6 +3,7 @@ package io.github.thebusybiscuit.slimefun4.implementation.items.electric.machine import java.util.HashMap; import java.util.Map; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; @@ -108,6 +109,8 @@ public class BookBinder extends AContainer { return "BOOK_BINDER"; } + @Nonnull + @ParametersAreNonnullByDefault private Map combineEnchantments(Map ech1, Map ech2) { Map enchantments = new HashMap<>(); @@ -122,10 +125,12 @@ public class BookBinder extends AContainer { } } else { + int highestLevel = Math.max(a, b); + if (hasCustomMaxLevel.getValue()) { - return Math.max(a, b) > customMaxLevel.getValue() ? customMaxLevel.getValue() : Math.max(a, b); + return highestLevel > customMaxLevel.getValue() ? customMaxLevel.getValue() : highestLevel; } else { - return Math.max(a, b); + return highestLevel; } }