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

Actually comment the file

Browse Source
This commit is contained in:
ProfElements 2021-02-19 13:20:02 -06:00
parent 0439a48a16
commit c3349f8b4c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,6 +63,7 @@ public class BookBinder extends AContainer {
enchantMeta.addStoredEnchant(entry.getKey(), entry.getValue(), bypassVanillaMaxLevel.getValue()); enchantMeta.addStoredEnchant(entry.getKey(), entry.getValue(), bypassVanillaMaxLevel.getValue());
} }
//Make sure we never return a no enchant enchanted book.
if (enchantMeta.getStoredEnchants().isEmpty()) { if (enchantMeta.getStoredEnchants().isEmpty()) {
return null; return null;
} }
@ -113,6 +114,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()) {
//Check if entry enchantments and conflictsWith enchantment conflict, and confirms that the enchantsments aren't the exact same.
if (entry.getKey().conflictsWith(conflictsWith.getKey()) && entry.getKey() != conflictsWith.getKey()) { if (entry.getKey().conflictsWith(conflictsWith.getKey()) && entry.getKey() != conflictsWith.getKey()) {
conflicts = true; conflicts = true;
} }
@ -123,7 +126,9 @@ public class BookBinder extends AContainer {
int enchantMaxLevel = entry.getKey().getMaxLevel(); int enchantMaxLevel = entry.getKey().getMaxLevel();
if (a.intValue() == b.intValue()) { if (a.intValue() == b.intValue()) {
if (enchantMaxLevel <= a) {
//Confirm the entries enchant level doesnt go over the maximums unless it uses bypass-vanilla-max-level
if (enchantMaxLevel <= a && !bypassVanillaMaxLevel.getValue()) {
return enchantMaxLevel; return enchantMaxLevel;
} }
else if (hasCustomMaxLevel.getValue()) { else if (hasCustomMaxLevel.getValue()) {
@ -134,7 +139,8 @@ public class BookBinder extends AContainer {
} else { } else {
int highestLevel = Math.max(a, b); int highestLevel = Math.max(a, b);
if (enchantMaxLevel <= highestLevel) { //Confirm the entries enchant level doesnt go over the maximums unless it uses bypass-vanilla-max-level
if (enchantMaxLevel <= highestLevel && !bypassVanillaMaxLevel.getValue()) {
return enchantMaxLevel; return enchantMaxLevel;
} }
else if (hasCustomMaxLevel.getValue()) { else if (hasCustomMaxLevel.getValue()) {