From 16a5a2ce067f9f0021b90aaeb3681ac48cd77f88 Mon Sep 17 00:00:00 2001 From: Rothes <449181985@qq.com> Date: Thu, 22 Apr 2021 11:58:52 +0800 Subject: [PATCH] Update --- .../items/electric/machines/enchanting/AutoDisenchanter.java | 4 ++-- .../items/electric/machines/enchanting/AutoEnchanter.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoDisenchanter.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoDisenchanter.java index 09a5ddb39..049dede83 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoDisenchanter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoDisenchanter.java @@ -142,12 +142,12 @@ public class AutoDisenchanter extends AbstractEnchantmentMachine { private boolean isDisenchantable(@Nullable ItemStack item) { if (item == null) { return false; - } else if (item.getType() != Material.BOOK) { + } else if (item.getType() != Material.BOOK && !hasIgnoredLore(item)) { // ^ This stops endless checks of getByItem for books SlimefunItem sfItem = SlimefunItem.getByItem(item); return sfItem == null || sfItem.isDisenchantable(); } else { - return !hasIgnoredLore(item); + return false; } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoEnchanter.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoEnchanter.java index 69e39a235..bc1729309 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoEnchanter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoEnchanter.java @@ -121,12 +121,12 @@ public class AutoEnchanter extends AbstractEnchantmentMachine { private boolean isEnchantable(@Nullable ItemStack item) { if (item == null) { 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. SlimefunItem sfItem = SlimefunItem.getByItem(item); return sfItem == null || sfItem.isEnchantable(); } else { - return !hasIgnoredLore(item); + return false; } }