Skip to content

Commit 663b568

Browse files
committed
fix sharp tools not taking damage when cutting grass
1 parent b70da92 commit 663b568

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

kubejs/server_scripts/tfg/events.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,7 @@ BlockEvents.broken('tfc:mineable_with_sharp_tool', event => {
546546
});
547547

548548
//#endregion
549+
<<<<<<< HEAD
549550
// TODO
550551
TFCEvents.startFire(event => {
551552
let player = event.player
@@ -575,4 +576,6 @@ TFCEvents.startFire(event => {
575576

576577

577578

578-
})
579+
})
580+
=======
581+
>>>>>>> b4c6f137 (fix sharp tools not taking damage when cutting grass)

0 commit comments

Comments
 (0)