From 6a250d6d00993c2e7b64f4a3861c837a440f8aa3 Mon Sep 17 00:00:00 2001 From: svr333 Date: Wed, 21 Oct 2020 22:28:59 +0200 Subject: [PATCH] Fix requested changes --- .../items/magical/talismans/Talisman.java | 16 ++++------------ .../listeners/TalismanListener.java | 2 +- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java index 9bdf2b012..80015d3ea 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java @@ -135,11 +135,11 @@ public class Talisman extends SlimefunItem { } public static boolean tryActivate(@Nonnull Event e, @Nonnull SlimefunItemStack stack) { - return (tryActivateAndGet(e, stack.getItem()) != null); + return tryActivateAndGet(e, stack.getItem()) != null; } public static boolean tryActivate(@Nonnull Event e, @Nonnull SlimefunItem item) { - return (tryActivateAndGet(e, item) != null); + return tryActivateAndGet(e, item) != null; } public static ItemStack tryActivateAndGet(@Nonnull Event e, @Nonnull SlimefunItemStack stack) { @@ -162,20 +162,16 @@ public class Talisman extends SlimefunItem { return null; } - if (!Slimefun.hasUnlocked(p, talisman, true)) { - return null; - } - ItemStack possibleTalisman = retrieveTalismanFromInventory(p.getInventory(), talisman); - if (possibleTalisman != null) { + if (possibleTalisman != null && Slimefun.hasUnlocked(p, talisman, true)) { activateTalisman(e, p, p.getInventory(), talisman); return possibleTalisman; } possibleTalisman = retrieveTalismanFromInventory(p.getEnderChest(), talisman); - if (possibleTalisman != null) { + if (possibleTalisman != null && Slimefun.hasUnlocked(p, talisman, true)) { activateTalisman(e, p, p.getEnderChest(), talisman); return possibleTalisman; } @@ -194,10 +190,6 @@ public class Talisman extends SlimefunItem { } } - /* The point of this method is that it only gets called when youre sure there is - * a talisman in the inventory, so that it never returns null. - * However, this method will be nullable since there is an if statement and it needs - * to return something */ return null; } 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 cb3cf4d64..8da378db1 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 @@ -302,7 +302,7 @@ public class TalismanListener implements Listener { @EventHandler public void onBlockBreak(BlockBreakEvent e) { if (SlimefunTag.CAVEMAN_TALISMAN_TRIGGERS.isTagged(e.getBlock().getType())) { - Talisman.tryActivate(e, SlimefunItems.TALISMAN_WISE); + Talisman.tryActivate(e, SlimefunItems.TALISMAN_CAVEMAN); } }