mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 11:42:55 +01:00
71c84c8132
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
52 lines
2.4 KiB
Diff
52 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: aerulion <aerulion@gmail.com>
|
|
Date: Mon, 21 Aug 2023 04:36:07 +0200
|
|
Subject: [PATCH] Expose clicked BlockFace during BlockDamageEvent
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/block/BlockDamageEvent.java b/src/main/java/org/bukkit/event/block/BlockDamageEvent.java
|
|
index cd04a0bd9d232857408b38605787016a217cb8d2..392cde07d578d684423e1bf369af28696eb7e484 100644
|
|
--- a/src/main/java/org/bukkit/event/block/BlockDamageEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/block/BlockDamageEvent.java
|
|
@@ -19,9 +19,20 @@ public class BlockDamageEvent extends BlockEvent implements Cancellable {
|
|
private boolean instaBreak;
|
|
private boolean cancel;
|
|
private final ItemStack itemstack;
|
|
+ private final org.bukkit.block.BlockFace blockFace; // Paper - Expose BlockFace
|
|
|
|
+ // 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 end - expose blockface
|
|
this.instaBreak = instaBreak;
|
|
this.player = player;
|
|
this.itemstack = itemInHand;
|
|
@@ -67,6 +78,20 @@ public class BlockDamageEvent extends BlockEvent implements Cancellable {
|
|
public ItemStack getItemInHand() {
|
|
return itemstack;
|
|
}
|
|
+ // Paper start - Expose BlockFace
|
|
+ /**
|
|
+ * Gets the BlockFace the player is interacting with.
|
|
+ *
|
|
+ * @return The BlockFace clicked to damage the block
|
|
+ */
|
|
+ @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
|
|
|
|
@Override
|
|
public boolean isCancelled() {
|