fix some more compile issues

This commit is contained in:
Jake Potrebic 2023-06-08 12:35:20 -07:00
parent 7002799587
commit 0a9e232f48
No known key found for this signature in database
GPG key ID: ECE0B3C133C016C5
100 changed files with 155 additions and 136 deletions

View file

@ -5,10 +5,10 @@ Subject: [PATCH] Add openSign method to HumanEntity
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
index abdca9fe5acc90f167219eb769ece66c35682bb1..9715a9d36187e2eecfeab1a05087d27c28b8690e 100644
index abdca9fe5acc90f167219eb769ece66c35682bb1..b3aa3dc6aa5afbc36cc86741b4cba56f463c2234 100644
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -500,6 +500,14 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
@@ -500,6 +500,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
*/
@Deprecated
public void setShoulderEntityRight(@Nullable Entity entity);
@ -17,17 +17,29 @@ index abdca9fe5acc90f167219eb769ece66c35682bb1..9715a9d36187e2eecfeab1a05087d27c
+ * Opens an editor window for the specified sign
+ *
+ * @param sign The sign to open
+ * @deprecated use {@link #openSign(org.bukkit.block.Sign, org.bukkit.block.sign.Side)}
+ */
+ void openSign(@NotNull org.bukkit.block.Sign sign);
+ @Deprecated
+ default void openSign(@NotNull org.bukkit.block.Sign sign) {
+ this.openSign(sign, org.bukkit.block.sign.Side.FRONT);
+ }
+
+ /**
+ * Opens an editor window for the specified sign
+ *
+ * @param sign The sign to open
+ * @param side The side of the sign to open
+ */
+ void openSign(org.bukkit.block.@NotNull Sign sign, org.bukkit.block.sign.@NotNull Side side);
+ // Paper end
/**
* Make the entity drop the item in their hand.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 1879756c8dc3fa86e2aa2f223eee03b5fe2380eb..20f0803c8712f31d47be2bc6aee74d8b90b429a7 100644
index 1879756c8dc3fa86e2aa2f223eee03b5fe2380eb..d220c6253ffacc23d082d46a87f21cdde854f9f1 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2333,7 +2333,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2333,10 +2333,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
/**
* Open a Sign for editing by the Player.
*
@ -35,4 +47,9 @@ index 1879756c8dc3fa86e2aa2f223eee03b5fe2380eb..20f0803c8712f31d47be2bc6aee74d8b
+ * The Sign must be in the same world as the player.
*
* @param sign The sign to edit
+ * @deprecated use {@link #openSign(Sign, Side))}
*/
+ @Deprecated
public void openSign(@NotNull Sign sign);
/**