Merge pull request NCBPFluffyBear#144 from NCBPFluffyBear/revert-143-…

…master Revert "Fix trigger-other-plugins"
SlimefunGuguProject · Sep 29, 2023 · ccf029b · ccf029b
2 parents 2cc13b3 + f9c3caf
commit ccf029b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/io/ncbpfluffybear/fluffymachines/items/tools/UpgradedExplosiveTool.java b/src/main/java/io/ncbpfluffybear/fluffymachines/items/tools/UpgradedExplosiveTool.java
@@ -166,15 +166,17 @@ private void breakBlock(Player p, ItemStack item, Block b, List<ItemStack> drops
         // Don't break SF blocks
         if (sfItem != null) {
             return;
+        } else {
+            b.breakNaturally(item);
         }
 
+        damageItem(p, item);
+
         if (triggerOtherPlugins.getValue()) {
             AlternateBreakEvent breakEvent = new AlternateBreakEvent(b, p);
             Bukkit.getServer().getPluginManager().callEvent(breakEvent);
         }
 
-        b.breakNaturally(item);
-
-        damageItem(p, item);
     }
+
 }
diff --git a/src/main/java/io/ncbpfluffybear/fluffymachines/items/tools/UpgradedLumberAxe.java b/src/main/java/io/ncbpfluffybear/fluffymachines/items/tools/UpgradedLumberAxe.java
@@ -61,10 +61,10 @@ private ToolUseHandler onBlockBreak() {
                 for (Block b : logs) {
                     if (Slimefun.getProtectionManager().hasPermission(e.getPlayer(), b,
                         Interaction.BREAK_BLOCK) && BlockStorage.checkID(b) == null) {
+                        b.breakNaturally(tool);
                         if (triggerOtherPlugins.getValue()) {
                             Bukkit.getPluginManager().callEvent(new AlternateBreakEvent(b, e.getPlayer()));
                         }
-                        b.breakNaturally(tool);
                     }
                 }
             }