Fix BlockBreaker not calling BlockDamageEvent

Fix #312, Fix #337
xenondevs · Mar 29, 2024 · a1d1302 · a1d1302
1 parent 16e9140
commit a1d1302
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/nova/src/main/kotlin/xyz/xenondevs/nova/world/block/logic/break/BlockBreaker.kt b/nova/src/main/kotlin/xyz/xenondevs/nova/world/block/logic/break/BlockBreaker.kt
@@ -19,6 +19,7 @@ import org.bukkit.block.BlockFace
 import org.bukkit.craftbukkit.v1_20_R3.event.CraftEventFactory
 import org.bukkit.entity.Player
 import org.bukkit.event.block.BlockBreakEvent
+import org.bukkit.event.block.BlockDamageEvent
 import org.bukkit.event.block.BlockExpEvent
 import org.bukkit.inventory.ItemStack
 import org.bukkit.potion.PotionEffectType
@@ -146,14 +147,27 @@ internal sealed class BlockBreaker(val player: Player, val block: Block, val sta
         if (isDone)
             return
 
-        val damage = calculateDamage()
+        var damage = calculateDamage()
         val clientsideDamage = calculateClientsideDamage()
 
         if (clientsideDamage >= 1 && damage < 1) {
             stop(false, startSequence)
             return
         }
 
+        val damageEvent = BlockDamageEvent(
+            player,
+            block,
+            BlockFaceUtils.determineBlockFaceLookingAt(player.eyeLocation) ?: BlockFace.NORTH,
+            tool ?: ItemStack(Material.AIR),
+            damage > 1
+        )
+        callEvent(damageEvent)
+        if (damageEvent.isCancelled)
+            return
+        if (damageEvent.instaBreak && damage < 1)
+            damage = 1.0
+
         if (damage >= 1.0 || serverTick >= blockedUntil) {
             progress += damage