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
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
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
|
|
Subject: [PATCH] Add Sign#getInteractableSideFor
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/block/Sign.java b/src/main/java/org/bukkit/block/Sign.java
|
|
index 1fdb1144949adc3a2b5cbc3aca94d2f8e0c6d9ee..7983ccb54f5f358dea1ffb530b9cc5bd716fb9b1 100644
|
|
--- a/src/main/java/org/bukkit/block/Sign.java
|
|
+++ b/src/main/java/org/bukkit/block/Sign.java
|
|
@@ -187,4 +187,34 @@ public interface Sign extends TileState, Colorable {
|
|
*/
|
|
@Nullable
|
|
public Player getAllowedEditor();
|
|
+ // Paper start - get side for player
|
|
+ /**
|
|
+ * 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);
|
|
+ // Paper end
|
|
}
|