Merge pull request Slimefun#3862 from Sefiraat/fix/block_break_return

Fix incorrect return in BlockListener
xMikux · Jun 21, 2023 · 25bbe4f · 25bbe4f
2 parents becbc0b + a45b073
commit 25bbe4f
Showing 1 changed file with 8 additions and 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
@@ -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()) {