From f3fafabcff46c426e90ed883f74cbe2065f100b3 Mon Sep 17 00:00:00 2001 From: Name1ess Date: Mon, 25 Jan 2021 20:10:35 +0800 Subject: [PATCH] Update TalismanListener.java --- .../listeners/TalismanListener.java | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TalismanListener.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TalismanListener.java index 66aa9ed25..af5a0bf50 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TalismanListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TalismanListener.java @@ -221,21 +221,19 @@ public class TalismanListener implements Listener { Map enchantments = e.getEnchantsToAdd(); // Magician Talisman - if (Talisman.checkFor(e, SlimefunItems.TALISMAN_MAGICIAN)) { - MagicianTalisman talisman = (MagicianTalisman) SlimefunItems.TALISMAN_MAGICIAN.getItem(); - TalismanEnchantment enchantment = talisman.getRandomEnchantment(e.getItem(), enchantments.keySet()); + MagicianTalisman talisman = (MagicianTalisman) SlimefunItems.TALISMAN_MAGICIAN.getItem(); + TalismanEnchantment enchantment = talisman.getRandomEnchantment(e.getItem(), enchantments.keySet()); - if (enchantment != null) { - /* - * Fix #2679 - * By default, the Bukkit API doesn't allow us to give enchantment books extra enchantments. - */ - if (talisman.isEnchantmentBookAllowed() && e.getItem().getType() == Material.BOOK) { - e.getItem().addUnsafeEnchantment(enchantment.getEnchantment(), enchantment.getLevel()); - } else { - enchantments.put(enchantment.getEnchantment(), enchantment.getLevel()); - } - } + if (enchantment != null && Talisman.checkFor(e, SlimefunItems.TALISMAN_MAGICIAN)) { + /* + * Fix #2679 + * By default, the Bukkit API doesn't allow us to give enchantment books extra enchantments. + */ + if (talisman.isEnchantmentBookAllowed() && e.getItem().getType() == Material.BOOK) { + e.getItem().addUnsafeEnchantment(enchantment.getEnchantment(), enchantment.getLevel()); + } else { + enchantments.put(enchantment.getEnchantment(), enchantment.getLevel()); + } } // Wizard Talisman