geforkt von Mirrors/Paper
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
55 Zeilen
2.4 KiB
Diff
55 Zeilen
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: The456gamer <the456gamer@the456gamer.dev>
|
|
Date: Mon, 21 Aug 2023 14:13:43 +0100
|
|
Subject: [PATCH] Expose hand during BlockCanBuildEvent
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java b/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java
|
|
index a1350c0f74d445dca09eea6e10abac050bb06990..08d09c2a92d8aa6adf6610cc05905d58a76fce1f 100644
|
|
--- a/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java
|
|
@@ -25,10 +25,11 @@ public class BlockCanBuildEvent extends BlockEvent {
|
|
|
|
protected BlockData blockData;
|
|
private final Player player;
|
|
+ private final org.bukkit.inventory.EquipmentSlot hand; // Paper - expose hand
|
|
|
|
@Deprecated
|
|
public BlockCanBuildEvent(@NotNull final Block block, @NotNull final BlockData type, final boolean canBuild) {
|
|
- this(block, null, type, canBuild);
|
|
+ this(block, null, type, canBuild, org.bukkit.inventory.EquipmentSlot.HAND); // Paper - expose hand
|
|
}
|
|
|
|
/**
|
|
@@ -37,12 +38,30 @@ public class BlockCanBuildEvent extends BlockEvent {
|
|
* @param type the id of the block to place
|
|
* @param canBuild whether we can build
|
|
*/
|
|
+ @java.lang.Deprecated // Paper
|
|
+ @io.papermc.paper.annotation.DoNotUse // Paper
|
|
public BlockCanBuildEvent(@NotNull final Block block, @Nullable final Player player, @NotNull final BlockData type, final boolean canBuild) {
|
|
+ this(block, player, type, canBuild, org.bukkit.inventory.EquipmentSlot.HAND); // Paper start - expose hand
|
|
+ }
|
|
+ @org.jetbrains.annotations.ApiStatus.Internal
|
|
+ public BlockCanBuildEvent(@NotNull final Block block, @Nullable final Player player, @NotNull final BlockData type, final boolean canBuild, @NotNull final org.bukkit.inventory.EquipmentSlot hand) { // Paper end - expose hand
|
|
super(block);
|
|
this.player = player;
|
|
this.buildable = canBuild;
|
|
this.blockData = type;
|
|
+ this.hand = hand; // Paper
|
|
+ }
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the hand the player will use to place the block
|
|
+ *
|
|
+ * @return the EquipmentSlot representing the players hand.
|
|
+ */
|
|
+ @NotNull
|
|
+ public org.bukkit.inventory.EquipmentSlot getHand() {
|
|
+ return hand;
|
|
}
|
|
+ // Paper end
|
|
|
|
/**
|
|
* Gets whether or not the block can be built here.
|