2023-07-08 11:04:19 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
Date: Fri, 23 Jun 2023 12:16:35 -0700
|
2024-08-17 23:36:27 +02:00
|
|
|
Subject: [PATCH] More Sign Block API
|
2023-07-08 11:04:19 +02:00
|
|
|
|
2024-08-17 23:36:27 +02:00
|
|
|
Co-authored-by: SoSeDiK <mrsosedik@gmail.com>
|
2023-07-08 11:04:19 +02:00
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/block/Sign.java b/src/main/java/org/bukkit/block/Sign.java
|
2024-08-17 23:36:27 +02:00
|
|
|
index 1fdb1144949adc3a2b5cbc3aca94d2f8e0c6d9ee..340e3adcc57227f2e570826681ea81b9159805de 100644
|
2023-07-08 11:04:19 +02:00
|
|
|
--- a/src/main/java/org/bukkit/block/Sign.java
|
|
|
|
+++ b/src/main/java/org/bukkit/block/Sign.java
|
2024-08-17 23:36:27 +02:00
|
|
|
@@ -182,9 +182,58 @@ public interface Sign extends TileState, Colorable {
|
|
|
|
/**
|
|
|
|
* Gets the player that is currently allowed to edit this sign. <br>
|
|
|
|
* Edits from other players will be rejected if this value is not null.
|
|
|
|
+ * <br><br>You should prefer {@link #getAllowedEditorUniqueId()} if you don't
|
|
|
|
+ * need the player instance as this method will fetch the player from UUID.
|
|
|
|
*
|
|
|
|
* @return the player allowed to edit this sign, or null
|
2023-07-08 11:04:19 +02:00
|
|
|
*/
|
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
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
2024-02-23 14:37:33 +01:00
|
|
|
@Nullable
|
|
|
|
public Player getAllowedEditor();
|
2024-08-17 23:36:27 +02:00
|
|
|
+ // Paper start - More Sign Block API
|
|
|
|
+ /**
|
|
|
|
+ * Gets the allowed editor's UUID.
|
|
|
|
+ * <br>Edits from other players will be rejected if this value is not null.
|
|
|
|
+ *
|
|
|
|
+ * @return the allowed editor's UUID, or null
|
|
|
|
+ */
|
|
|
|
+ @Nullable java.util.UUID getAllowedEditorUniqueId();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Sets the allowed editor's UUID.
|
|
|
|
+ * <br><br><b>Note:</b> the server sets the UUID back to null if the player can't
|
|
|
|
+ * interact with the sign (is either offline or outside the allowed interaction range).
|
|
|
|
+ *
|
|
|
|
+ * @param uuid the allowed editor's UUID
|
|
|
|
+ */
|
|
|
|
+ void setAllowedEditorUniqueId(@Nullable java.util.UUID uuid);
|
|
|
|
+
|
2023-07-08 11:04:19 +02:00
|
|
|
+ /**
|
|
|
|
+ * Compute the side facing the specified entity.
|
|
|
|
+ *
|
|
|
|
+ * @param entity the entity
|
|
|
|
+ * @return the side it is facing
|
|
|
|
+ */
|
|
|
|
+ default @NotNull Side getInteractableSideFor(org.bukkit.entity.@NotNull Entity entity) {
|
|
|
|
+ return this.getInteractableSideFor(entity.getLocation());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Compute the side facing the specific position.
|
|
|
|
+ *
|
|
|
|
+ * @param position the position
|
|
|
|
+ * @return the side the position is facing
|
|
|
|
+ */
|
|
|
|
+ default @NotNull Side getInteractableSideFor(io.papermc.paper.math.@NotNull Position position) {
|
|
|
|
+ return this.getInteractableSideFor(position.x(), position.z());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Compute the side facing the specific x and z coordinates.
|
|
|
|
+ *
|
|
|
|
+ * @param x the x coord
|
|
|
|
+ * @param z the z coord
|
|
|
|
+ * @return the side the coordinates are facing
|
|
|
|
+ */
|
|
|
|
+ @NotNull Side getInteractableSideFor(double x, double z);
|
2024-08-17 23:36:27 +02:00
|
|
|
+ // Paper end - More Sign Block API
|
2023-07-08 11:04:19 +02:00
|
|
|
}
|