diff --git a/patches/api/Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/Expose-clicked-BlockFace-during-BlockDamageEvent.patch
index feb9146402..89b6bb8b22 100644
--- a/patches/api/Expose-clicked-BlockFace-during-BlockDamageEvent.patch
+++ b/patches/api/Expose-clicked-BlockFace-during-BlockDamageEvent.patch
@@ -14,11 +14,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private final ItemStack itemstack;
 +    private final org.bukkit.block.BlockFace blockFace; // Paper - Expose BlockFace
  
--    public BlockDamageEvent(@NotNull final Player player, @NotNull final Block block, @NotNull final ItemStack itemInHand, final boolean instaBreak) {
++    // Paper start - expose blockface
++    @Deprecated(forRemoval = true)
++    @io.papermc.paper.annotation.DoNotUse
+     public BlockDamageEvent(@NotNull final Player player, @NotNull final Block block, @NotNull final ItemStack itemInHand, final boolean instaBreak) {
++        this(player, block, null, itemInHand, instaBreak); // Some plugin do bad things...
++    }
++
 +    @org.jetbrains.annotations.ApiStatus.Internal // Paper
 +    public BlockDamageEvent(@NotNull final Player player, @NotNull final Block block, @NotNull final org.bukkit.block.BlockFace blockFace, @NotNull final ItemStack itemInHand, final boolean instaBreak) { // Paper - Expose BlockFace
          super(block);
-+        this.blockFace = blockFace; // Paper - Expose BlockFace
++        this.blockFace = blockFace;
++        // Paper end - expose blockface
          this.instaBreak = instaBreak;
          this.player = player;
          this.itemstack = itemInHand;
@@ -34,6 +41,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     */
 +    @NotNull
 +    public org.bukkit.block.BlockFace getBlockFace() {
++        if (this.blockFace == null) {
++            throw new IllegalStateException("BlockFace is not available for this event, most likely due to a bad constructor call by a plugin");
++        }
 +        return this.blockFace;
 +    }
 +    //Paper end