mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 03:35:51 +00:00
Make requested changes
This commit is contained in:
parent
c643a52b4e
commit
0439a48a16
@ -113,14 +113,9 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!conflicts) {
|
if (!conflicts) {
|
||||||
@ -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;
|
||||||
|
Loading…
Reference in New Issue
Block a user