From e953eb1c81658b3da172b470607e4ac6e9529366 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Fri, 30 Oct 2020 23:03:44 +0100 Subject: [PATCH] Refactored talisman grabbing method --- .../items/magical/talismans/Talisman.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 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 befa9b567..ce53aef99 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 @@ -180,14 +180,14 @@ public class Talisman extends SlimefunItem { return null; } - ItemStack possibleTalisman = retrieveTalismanFromInventory(p.getInventory(), talisman); + ItemStack possibleTalisman = retrieveTalismanFromInventory(p.getInventory(), talisman.getItem()); if (possibleTalisman != null && Slimefun.hasUnlocked(p, talisman, true)) { activateTalisman(e, p, p.getInventory(), talisman, possibleTalisman); return possibleTalisman; } - possibleTalisman = retrieveTalismanFromInventory(p.getEnderChest(), talisman); + possibleTalisman = retrieveTalismanFromInventory(p.getEnderChest(), talisman.getEnderVariant()); if (possibleTalisman != null && Slimefun.hasUnlocked(p, talisman, true)) { activateTalisman(e, p, p.getEnderChest(), talisman, possibleTalisman); @@ -198,13 +198,9 @@ public class Talisman extends SlimefunItem { } @Nullable - private static ItemStack retrieveTalismanFromInventory(@Nonnull Inventory inv, @Nonnull Talisman talisman) { - ItemStack[] contents = inv.getContents(); - - for (int i = 0; i < contents.length; i++) { - ItemStack item = contents[i]; - - if (talisman.isItem(item)) { + private static ItemStack retrieveTalismanFromInventory(@Nonnull Inventory inv, @Nonnull ItemStack talismanItem) { + for (ItemStack item : inv) { + if (SlimefunUtils.isItemSimilar(item, talismanItem, false, false) { return item; } }