From b87354a39e5f97984fb0cd2d549c59dcffc8edf6 Mon Sep 17 00:00:00 2001 From: Nameless Date: Wed, 12 Feb 2020 14:07:42 +0800 Subject: [PATCH] Fixed #1516 --- .../implementation/listeners/TalismanListener.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 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 094d476a9..83bbf0c75 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 @@ -146,7 +146,6 @@ public class TalismanListener implements Listener { */ @EventHandler public void onBlockBreak(BlockBreakEvent e) { - Collection drops = new ArrayList<>(); ItemStack item = e.getPlayer().getInventory().getItemInMainHand(); int fortune = 1; Random random = ThreadLocalRandom.current(); @@ -158,14 +157,10 @@ public class TalismanListener implements Listener { fortune = (e.getBlock().getType() == Material.LAPIS_ORE ? 4 + random.nextInt(5) : 1) * (fortune + 1); } - if (!item.getEnchantments().containsKey(Enchantment.SILK_TOUCH) && e.getBlock().getType().toString().endsWith("_ORE") && Talisman.checkFor(e, (SlimefunItemStack) SlimefunItems.TALISMAN_MINER)) { - if (drops.isEmpty()) { - drops = e.getBlock().getDrops(); - } - - for (ItemStack drop : new ArrayList<>(drops)) { + if (!item.getEnchantments().containsKey(Enchantment.SILK_TOUCH) && MaterialCollections.getAllOres().contains(e.getBlock().getType()) && Talisman.checkFor(e, (SlimefunItemStack) SlimefunItems.TALISMAN_MINER)) { + for (ItemStack drop : new ArrayList<>(e.getBlock().getDrops(item))) { if (!drop.getType().isBlock()) { - drops.add(new CustomItem(drop, fortune * 2)); + e.getPlayer().getInventory().addItem(new CustomItem(drop, (fortune * 2) - 1)); } } }