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

Make requested changes

Browse Source
This commit is contained in:
ProfElements 2021-02-19 13:01:48 -06:00
parent c643a52b4e
commit 0439a48a16
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,13 +113,8 @@ public class BookBinder extends AContainer {
for (Map.Entry<Enchantment, Integer> entry : ech2.entrySet()) { for (Map.Entry<Enchantment, Integer> entry : ech2.entrySet()) {
for (Map.Entry<Enchantment, Integer> conflictsWith : enchantments.entrySet()) { for (Map.Entry<Enchantment, Integer> conflictsWith : enchantments.entrySet()) {
if (entry.getKey().conflictsWith(conflictsWith.getKey())) { if (entry.getKey().conflictsWith(conflictsWith.getKey()) && entry.getKey() != conflictsWith.getKey()) {
if (entry.getKey() == conflictsWith.getKey()) {
} else {
conflicts = true; conflicts = true;
}
} }
} }
@ -131,7 +126,7 @@ public class BookBinder extends AContainer {
if (enchantMaxLevel <= a) { if (enchantMaxLevel <= a) {
return enchantMaxLevel; return enchantMaxLevel;
} }
if (hasCustomMaxLevel.getValue()) { else if (hasCustomMaxLevel.getValue()) {
return a + 1 > customMaxLevel.getValue() ? customMaxLevel.getValue() : a + 1; return a + 1 > customMaxLevel.getValue() ? customMaxLevel.getValue() : a + 1;
} else { } else {
return a + 1; return a + 1;
@ -142,8 +137,7 @@ public class BookBinder extends AContainer {
if (enchantMaxLevel <= highestLevel) { if (enchantMaxLevel <= highestLevel) {
return enchantMaxLevel; return enchantMaxLevel;
} }
else if (hasCustomMaxLevel.getValue()) {
if (hasCustomMaxLevel.getValue()) {
return highestLevel > customMaxLevel.getValue() ? customMaxLevel.getValue() : highestLevel; return highestLevel > customMaxLevel.getValue() ? customMaxLevel.getValue() : highestLevel;
} else { } else {
return highestLevel; return highestLevel;