From 0439a48a1668ff4e9e6e7276ee54e5f489892367 Mon Sep 17 00:00:00 2001 From: ProfElements Date: Fri, 19 Feb 2021 13:01:48 -0600 Subject: [PATCH] Make requested changes --- .../items/electric/machines/BookBinder.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 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 a4dd5e52f..6129fd0cb 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 @@ -113,13 +113,8 @@ public class BookBinder extends AContainer { for (Map.Entry entry : ech2.entrySet()) { for (Map.Entry conflictsWith : enchantments.entrySet()) { - if (entry.getKey().conflictsWith(conflictsWith.getKey())) { - if (entry.getKey() == conflictsWith.getKey()) { - - } else { + if (entry.getKey().conflictsWith(conflictsWith.getKey()) && entry.getKey() != conflictsWith.getKey()) { conflicts = true; - } - } } @@ -131,7 +126,7 @@ public class BookBinder extends AContainer { if (enchantMaxLevel <= a) { return enchantMaxLevel; } - if (hasCustomMaxLevel.getValue()) { + else if (hasCustomMaxLevel.getValue()) { return a + 1 > customMaxLevel.getValue() ? customMaxLevel.getValue() : a + 1; } else { return a + 1; @@ -142,8 +137,7 @@ public class BookBinder extends AContainer { if (enchantMaxLevel <= highestLevel) { return enchantMaxLevel; } - - if (hasCustomMaxLevel.getValue()) { + else if (hasCustomMaxLevel.getValue()) { return highestLevel > customMaxLevel.getValue() ? customMaxLevel.getValue() : highestLevel; } else { return highestLevel;