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

Update

Browse Source
This commit is contained in:
Rothes 2021-04-22 11:58:52 +08:00 committed by BuildTools
parent 76f5848e08
commit 16a5a2ce06
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoDisenchanter.java
View File

@ -142,12 +142,12 @@ public class AutoDisenchanter extends AbstractEnchantmentMachine {
private boolean isDisenchantable(@Nullable ItemStack item) { private boolean isDisenchantable(@Nullable ItemStack item) {
if (item == null) { if (item == null) {
return false; return false;
} else if (item.getType() != Material.BOOK) { } else if (item.getType() != Material.BOOK && !hasIgnoredLore(item)) {
// ^ This stops endless checks of getByItem for books // ^ This stops endless checks of getByItem for books
SlimefunItem sfItem = SlimefunItem.getByItem(item); SlimefunItem sfItem = SlimefunItem.getByItem(item);
return sfItem == null || sfItem.isDisenchantable(); return sfItem == null || sfItem.isDisenchantable();
} else { } else {
return !hasIgnoredLore(item); return false;
} }
} }

4
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoEnchanter.java
View File

@ -121,12 +121,12 @@ public class AutoEnchanter extends AbstractEnchantmentMachine {
private boolean isEnchantable(@Nullable ItemStack item) { private boolean isEnchantable(@Nullable ItemStack item) {
if (item == null) { if (item == null) {
return false; return false;
} else if (item.getType() != Material.ENCHANTED_BOOK) { } else if (item.getType() != Material.ENCHANTED_BOOK && !hasIgnoredLore(item)) {
// stops endless checks of getByItem for enchanted book stacks. // stops endless checks of getByItem for enchanted book stacks.
SlimefunItem sfItem = SlimefunItem.getByItem(item); SlimefunItem sfItem = SlimefunItem.getByItem(item);
return sfItem == null || sfItem.isEnchantable(); return sfItem == null || sfItem.isEnchantable();
} else { } else {
return !hasIgnoredLore(item); return false;
} }
} }