mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 03:48:01 +01:00
52a05907c7
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: 97c59261 PR-1073: Make Biome an interface a38581aa Fix further javadoc errors 8271c490 Fix javadoc error 8a9ecf29 PR-1072: Fix bad naming for Vault State methods 6dd58108 PR-1071: Make Fluid an interface and add missing entry ed2cdfc3 PR-1070: Make Attribute an interface and align names with the new minecraft ones 63472efb PR-1069: Add missing winter drop experimental annotation to pale boats CraftBukkit Changes: 7235ad7b0 PR-1501: Make Biome an interface 602904003 PR-1500: Rename implementation for Vault State methods 75f26f79f PR-1499: Make Fluid an interface and add missing entry 4cfd87adc PR-1498: Make Attribute an interface and align names with the new minecraft ones 6bb0db5cb SPIGOT-7928: ExactChoice acts as MaterialChoice 3eaf3a13c SPIGOT-7929: Error when setting EquippableComponent abbf57bac SPIGOT-7930: Fix spawning entities with SummonEntityEffect 92d6ab6cf PR-1497: Move boat field rename entries to below key renaming, so that keys are also renamed abfe292aa PR-1496: Use correct Fluid class on Tags type check c7aab7fa7 SPIGOT-7923: Fix Dispenser logic to avoid firing empty projectiles
53 lines
2.4 KiB
Diff
53 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() {
|