From a45b07342cad84efb96e71a78714f628ed40a0c0 Mon Sep 17 00:00:00 2001
From: Sefiraat <miakis@me.com>
Date: Wed, 21 Jun 2023 08:52:26 +0100
Subject: [PATCH] Fix incorrect return

---
 .../implementation/listeners/BlockListener.java | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

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 86c40e09f2..a8dcfc7ccb 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,16 +129,15 @@ public void onBlockBreak(BlockBreakEvent e) {
         ItemStack item = e.getPlayer().getInventory().getItemInMainHand();
         SlimefunItem sfItem = BlockStorage.check(e.getBlock());
 
-        if (sfItem == null) {
-            return;
-        }
+        // If there is a Slimefun Block here, call our BreakEvent and, if cancelled, cancel this event and return
+        if (sfItem != null) {
+            SlimefunBlockBreakEvent breakEvent = new SlimefunBlockBreakEvent(e.getPlayer(), item, e.getBlock(), sfItem);
+            Bukkit.getPluginManager().callEvent(breakEvent);
 
-        SlimefunBlockBreakEvent breakEvent = new SlimefunBlockBreakEvent(e.getPlayer(), item, e.getBlock(), sfItem);
-        Bukkit.getPluginManager().callEvent(breakEvent);
-
-        if (breakEvent.isCancelled()) {
-            e.setCancelled(true);
-            return;
+            if (breakEvent.isCancelled()) {
+                e.setCancelled(true);
+                return;
+            }
         }
 
         if (!e.isCancelled()) {