Merge branch 'Slimefun:master' into master

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java

@@ -14,6 +14,7 @@
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
+import org.bukkit.block.BlockState;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
@@ -26,11 +27,11 @@
 import org.bukkit.inventory.meta.ItemMeta;
 
 import io.github.bakedlibs.dough.protection.Interaction;
-import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion;
 import io.github.thebusybiscuit.slimefun4.api.events.ExplosiveToolBreakBlocksEvent;
 import io.github.thebusybiscuit.slimefun4.api.events.SlimefunBlockBreakEvent;
 import io.github.thebusybiscuit.slimefun4.api.events.SlimefunBlockPlaceEvent;
 import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
+import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion;
 import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable;
 import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler;
 import io.github.thebusybiscuit.slimefun4.core.handlers.BlockPlaceHandler;
@@ -167,13 +168,16 @@ public void onBlockBreak(BlockBreakEvent e) {
         }
 
         if (!e.isCancelled()) {
+            // Checks for Slimefun sensitive blocks above, using Slimefun Tags
+            // TODO: merge this with the vanilla sensitive block check (when 1.18- is dropped)
             checkForSensitiveBlockAbove(e.getPlayer(), e.getBlock(), item);
 
             callBlockHandler(e, item, drops, sfItem);
 
-            checkForSensitiveBlocks(e.getBlock(), 0);
-
             dropItems(e, drops);
+
+            // Checks for vanilla sensitive blocks everywhere
+            checkForSensitiveBlocks(e.getBlock(), 0, e.isDropItems());
         }
     }
 
@@ -243,55 +247,6 @@ private void dropItems(BlockBreakEvent e, List<ItemStack> drops) {
         }
     }
 
-    /**
-     * This method checks recursively for any sensitive blocks
-     * that are no longer supported due to this block breaking
-     *
-     * @param block
-     *      The {@link Block} in question
-     * @param count
-     *      The amount of times this has been recursively called
-     */
-    @ParametersAreNonnullByDefault
-    private void checkForSensitiveBlocks(Block block, Integer count) {
-        if (count >= Bukkit.getServer().getMaxChainedNeighborUpdates()) {
-            return;
-        }
-        BlockData blockData = block.getBlockData();
-        block.setType(Material.AIR, false);
-        for (BlockFace face : CARDINAL_BLOCKFACES) {
-            if (!isSupported(block.getRelative(face).getBlockData(), block.getRelative(face))) {
-                Block relative = block.getRelative(face);
-                for (ItemStack drop : relative.getDrops()) {
-                    block.getWorld().dropItemNaturally(relative.getLocation(), drop);
-                }
-                checkForSensitiveBlocks(relative, ++count);
-            }
-        }
-        block.setBlockData(blockData, false);
-    }
-
-    /**
-     * This method checks if the {@link BlockData} would be
-     * supported at the given {@link Block}.
-     *
-     * @param blockData
-     *      The {@link BlockData} to check
-     * @param block
-     *      The {@link Block} the {@link BlockData} would be at
-     * @return
-     *      Whether the {@link BlockData} would be supported at the given {@link Block}
-     */
-    @ParametersAreNonnullByDefault
-    private boolean isSupported(BlockData blockData, Block block) {
-        if (Slimefun.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_19)) {
-            return blockData.isSupported(block);
-        } else {
-            // TODO: Make 1.16-1.18 version. BlockData::isSupported is 1.19+.
-            return true;
-        }
-    }
-
     /**
      * This method checks for a sensitive {@link Block}.
      * Sensitive {@link Block Blocks} are pressure plates or saplings, which should be broken
@@ -336,6 +291,61 @@ private void checkForSensitiveBlockAbove(Player player, Block block, ItemStack i
         }
     }
 
+    /**
+     * This method checks recursively for any sensitive blocks
+     * that are no longer supported due to this block breaking
+     *
+     * @param block
+     *      The {@link Block} in question
+     * @param count
+     *      The amount of times this has been recursively called
+     */
+    @ParametersAreNonnullByDefault
+    private void checkForSensitiveBlocks(Block block, Integer count, boolean isDropItems) {
+        if (count >= Bukkit.getServer().getMaxChainedNeighborUpdates()) {
+            return;
+        }
+
+        BlockState state = block.getState();
+        // We set the block to air to make use of BlockData#isSupported.
+        block.setType(Material.AIR, false);
+        for (BlockFace face : CARDINAL_BLOCKFACES) {
+            if (!isSupported(block.getRelative(face).getBlockData(), block.getRelative(face))) {
+                Block relative = block.getRelative(face);
+                if (!isDropItems) {
+                    for (ItemStack drop : relative.getDrops()) {
+                        block.getWorld().dropItemNaturally(relative.getLocation(), drop);
+                    }
+                }
+                checkForSensitiveBlocks(relative, ++count, isDropItems);
+            }
+        }
+        // Set the BlockData back: this makes it so containers and spawners drop correctly. This is a hacky fix.
+        block.setBlockData(state.getBlockData(), false);
+        state.update(true, false);
+    }
+
+    /**
+     * This method checks if the {@link BlockData} would be
+     * supported at the given {@link Block}.
+     *
+     * @param blockData
+     *      The {@link BlockData} to check
+     * @param block
+     *      The {@link Block} the {@link BlockData} would be at
+     * @return
+     *      Whether the {@link BlockData} would be supported at the given {@link Block}
+     */
+    @ParametersAreNonnullByDefault
+    private boolean isSupported(BlockData blockData, Block block) {
+        if (Slimefun.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_19)) {
+            return blockData.isSupported(block);
+        } else {
+            // TODO: Make 1.16-1.18 version. BlockData::isSupported is 1.19+.
+            return true;
+        }
+    }
+
     private int getBonusDropsWithFortune(@Nullable ItemStack item, @Nonnull Block b) {
         int amount = 1;