From bcd3a0c35650b653d08eedf593e6cbd1c879f08e Mon Sep 17 00:00:00 2001 From: Mqrius Date: Sun, 14 Dec 2025 19:03:13 +0100 Subject: [PATCH] Fix sharp tools BlockEvent filter (#2419) Signed-off-by: Mqrius --- kubejs/server_scripts/tfg/events.interactions.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/kubejs/server_scripts/tfg/events.interactions.js b/kubejs/server_scripts/tfg/events.interactions.js index c7ca21bf3..45a9276a9 100644 --- a/kubejs/server_scripts/tfg/events.interactions.js +++ b/kubejs/server_scripts/tfg/events.interactions.js @@ -503,19 +503,20 @@ BlockEvents.rightClicked(event => { }); // Makes scythes, hoes, and knives take damage when cutting grass -BlockEvents.broken('tfc:mineable_with_sharp_tool', event => { - let player = event.player; - let toolUsed = player.mainHandItem; +BlockEvents.broken(event => { + const { server, item, player, block } = event; - if (!toolUsed.hasTag('tfc:sharp_tools')) { + if (!block.hasTag('tfc:mineable_with_sharp_tool') || !toolUsed.hasTag('tfc:sharp_tools')) { return; } + + let toolUsed = player.mainHandItem; if (!player.isCreative()) { toolUsed.damageValue++; if (toolUsed.damageValue >= toolUsed.maxDamage) { - event.server.runCommandSilent(`playsound minecraft:item.shield.break player ${player.username} ${player.x} ${player.y} ${player.z} 1 1 1`); + server.runCommandSilent(`playsound minecraft:item.shield.break player ${player.username} ${player.x} ${player.y} ${player.z} 1 1 1`); toolUsed.count--; } } -}); \ No newline at end of file +});