Add BlockBreakProgressUpdateEvent (#10300)

2 files changed, 96 insertions, 0 deletions

diff --git a/patches/api/0468-Add-BlockBreakProgressUpdateEvent.patch b/patches/api/0468-Add-BlockBreakProgressUpdateEvent.patch
new file mode 100644
index 0000000000..a2b5a83baf
--- /dev/null
+++ b/patches/api/0468-Add-BlockBreakProgressUpdateEvent.patch
@@ -0,0 +1,68 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Badbird5907 <[email protected]>
+Date: Mon, 4 Mar 2024 22:18:33 -0500
+Subject: [PATCH] Add BlockBreakProgressUpdateEvent
+
+
+diff --git a/src/main/java/io/papermc/paper/event/block/BlockBreakProgressUpdateEvent.java b/src/main/java/io/papermc/paper/event/block/BlockBreakProgressUpdateEvent.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..0cd1ab085222eae1a8df8ad85b26b49b6dd93a09
+--- /dev/null
++++ b/src/main/java/io/papermc/paper/event/block/BlockBreakProgressUpdateEvent.java
+@@ -0,0 +1,56 @@
++package io.papermc.paper.event.block;
++
++import org.bukkit.block.Block;
++import org.bukkit.entity.Entity;
++import org.bukkit.event.HandlerList;
++import org.bukkit.event.block.BlockEvent;
++import org.jetbrains.annotations.ApiStatus;
++import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Range;
++
++/**
++ * Called when the progress of a block break is updated.
++ */
++public class BlockBreakProgressUpdateEvent extends BlockEvent {
++    private static final HandlerList HANDLER_LIST = new HandlerList();
++
++    private final float progress;
++    private final Entity entity;
++
++    @ApiStatus.Internal
++    public BlockBreakProgressUpdateEvent(@NotNull final Block block, final float progress, @NotNull final Entity entity) {
++        super(block);
++        this.progress = progress;
++        this.entity = entity;
++    }
++
++    /**
++     * The progress of the block break
++     * <p>
++     * The progress ranges from 0.0 - 1.0, where 0 is no damage and
++     * 1.0 is the most damaged
++     *
++     * @return The progress of the block break
++     */
++    public float getProgress() {
++        return progress;
++    }
++
++    /**
++     * The entity breaking the block.
++     *
++     * @return The entity breaking the block
++     */
++    @NotNull
++    public Entity getEntity() {
++        return entity;
++    }
++
++    @Override
++    public @NotNull HandlerList getHandlers() {
++        return HANDLER_LIST;
++    }
++    public static @NotNull HandlerList getHandlerList() {
++        return HANDLER_LIST;
++    }
++}
diff --git a/patches/server/1054-Add-BlockBreakProgressUpdateEvent.patch b/patches/server/1054-Add-BlockBreakProgressUpdateEvent.patch
new file mode 100644
index 0000000000..382b360aff
--- /dev/null
+++ b/patches/server/1054-Add-BlockBreakProgressUpdateEvent.patch
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Badbird5907 <[email protected]>
+Date: Mon, 4 Mar 2024 22:18:28 -0500
+Subject: [PATCH] Add BlockBreakProgressUpdateEvent
+
+
+diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
+index bf5e47e8c3706590fdc0731bd9a5858b56d06136..502bdc726b7890b00ee36871d905dea44e8719e3 100644
+--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
++++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+@@ -1772,6 +1772,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
+         if (entity instanceof Player) entityhuman = (Player) entity;
+         // CraftBukkit end
+ 
++        // Paper start - Add BlockBreakProgressUpdateEvent
++        // If a plugin is using this method to send destroy packets for a client-side only entity id, no block progress occurred on the server.
++        // Hence, do not call the event.
++        if (entity != null) {
++            float progressFloat = Mth.clamp(progress, 0, 10) / 10.0f;
++            org.bukkit.craftbukkit.block.CraftBlock bukkitBlock = org.bukkit.craftbukkit.block.CraftBlock.at(this, pos);
++            new io.papermc.paper.event.block.BlockBreakProgressUpdateEvent(bukkitBlock, progressFloat, entity.getBukkitEntity())
++                .callEvent();
++        }
++        // Paper end - Add BlockBreakProgressUpdateEvent
++
+         while (iterator.hasNext()) {
+             ServerPlayer entityplayer = (ServerPlayer) iterator.next();
+