diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BukkitCustomBlock.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BukkitCustomBlock.java
index 1e6dc8385..df0f1a768 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BukkitCustomBlock.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/BukkitCustomBlock.java
@@ -182,7 +182,6 @@ public final class BukkitCustomBlock extends AbstractCustomBlock {
                 if (settings.burnable()) {
                     CoreReflections.method$FireBlock$setFlammable.invoke(MBlocks.FIRE, nmsBlock, settings.burnChance(), settings.fireSpreadChance());
                 }
-                CoreReflections.field$BlockStateBase$requiresCorrectToolForDrops.set(nmsState, settings.requireCorrectTool());
             }
         } catch (Exception e) {
             CraftEngine.instance().logger().warn("Failed to init block settings", e);
diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/injector/BlockStateGenerator.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/injector/BlockStateGenerator.java
index 05640261b..edd60946d 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/injector/BlockStateGenerator.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/injector/BlockStateGenerator.java
@@ -98,13 +98,13 @@ public final class BlockStateGenerator {
             if (vec3 == null) return List.of();
 
             Object tool = FastNMS.INSTANCE.method$LootParams$Builder$getOptionalParameter(builder, MLootContextParams.TOOL);
-
             Item<ItemStack> item = BukkitItemManager.instance().wrap(tool == null || FastNMS.INSTANCE.method$ItemStack$isEmpty(tool) ? null : FastNMS.INSTANCE.method$CraftItemStack$asCraftMirror(tool));
+            Object optionalPlayer = FastNMS.INSTANCE.method$LootParams$Builder$getOptionalParameter(builder, MLootContextParams.THIS_ENTITY);
 
             // do not drop if it's not the correct tool
             BlockSettings settings = state.settings();
-            if (settings.requireCorrectTool()) {
-                if (tool == null) return List.of();
+            if (optionalPlayer != null && settings.requireCorrectTool()) {
+                if (item == null) return List.of();
                 if (!settings.isCorrectTool(item.id()) &&
                         (!settings.respectToolComponent() || !FastNMS.INSTANCE.method$ItemStack$isCorrectToolForDrops(tool, state.customBlockState().handle()))) {
                     return List.of();
@@ -118,7 +118,7 @@ public final class BlockStateGenerator {
             if (item != null) {
                 lootBuilder.withParameter(DirectContextParameters.ITEM_IN_HAND, item);
             }
-            Object optionalPlayer = FastNMS.INSTANCE.method$LootParams$Builder$getOptionalParameter(builder, MLootContextParams.THIS_ENTITY);
+
             BukkitServerPlayer player = optionalPlayer != null ? BukkitCraftEngine.instance().adapt(FastNMS.INSTANCE.method$ServerPlayer$getBukkitEntity(optionalPlayer)) : null;
             Float radius = (Float) FastNMS.INSTANCE.method$LootParams$Builder$getOptionalParameter(builder, MLootContextParams.EXPLOSION_RADIUS);
             if (radius != null) {
diff --git a/common-files/src/main/resources/resources/default/configuration/blocks.yml b/common-files/src/main/resources/resources/default/configuration/blocks.yml
index f222d3436..f97b2da35 100644
--- a/common-files/src/main/resources/resources/default/configuration/blocks.yml
+++ b/common-files/src/main/resources/resources/default/configuration/blocks.yml
@@ -67,6 +67,9 @@ items#misc:
           template:
             - default:pickaxe_power/level_4
           overrides:
+            tags:
+              - minecraft:mineable/pickaxe
+              - minecraft:anvil
             sounds:
               break: minecraft:block.anvil.break
               step: minecraft:block.anvil.step