From eead20cb7e07e71345bce902a5615ee2cb6576bd Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Fri, 17 Apr 2020 14:59:49 +0200 Subject: [PATCH] Fixes #1814 --- CHANGELOG.md | 1 + .../implementation/listeners/BlockListener.java | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a3a03896..1357a1b4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -86,6 +86,7 @@ * Fixed #1807 * Fixed Coolers accepting non-Juice items * Fixed #1813 +* Fixed #1814 ## Release Candidate 10 (28 Mar 2020) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java index 95a6777b0..1b9191f8e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java @@ -129,11 +129,7 @@ public class BlockListener implements Listener { SlimefunBlockHandler blockHandler = SlimefunPlugin.getRegistry().getBlockHandlers().get(sfItem.getID()); if (blockHandler != null) { - if (blockHandler.onBreak(e.getPlayer(), e.getBlock(), sfItem, UnregisterReason.PLAYER_BREAK)) { - drops.addAll(sfItem.getDrops()); - BlockStorage.clearBlockInfo(e.getBlock()); - } - else { + if (!blockHandler.onBreak(e.getPlayer(), e.getBlock(), sfItem, UnregisterReason.PLAYER_BREAK)) { e.setCancelled(true); return; } @@ -141,6 +137,9 @@ public class BlockListener implements Listener { else { sfItem.callItemHandler(BlockBreakHandler.class, handler -> handler.onBlockBreak(e, item, fortune, drops)); } + + drops.addAll(sfItem.getDrops()); + BlockStorage.clearBlockInfo(e.getBlock()); } if (item.getType() != Material.AIR) {