mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

more compile fixes

Browse source
This commit is contained in:
Jake Potrebic 2023-06-08 13:56:13 -07:00
parent 0a9e232f48
commit f0aea8123e
No known key found for this signature in database
GPG key ID: ECE0B3C133C016C5
58 changed files with 177 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

14
patches/api/0343-Multi-Block-Change-API.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Multi Block Change API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 529b2a524dafa17fdaa8dedaf551aec114a5cb7f..d2b2660eb8c4302fc46de8cdc4bc522714d13c8f 100644
index 529b2a524dafa17fdaa8dedaf551aec114a5cb7f..795984fbdd433b30e3680b3d3ae436944c86e533 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -672,6 +672,27 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -672,6 +672,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void sendBlockDamage(@NotNull Location loc, float progress);
@ -19,9 +19,7 @@ index 529b2a524dafa17fdaa8dedaf551aec114a5cb7f..d2b2660eb8c4302fc46de8cdc4bc5227
+ *
+ * @param blockChanges A map of the positions you want to change to their new block data
+ */
+ default void sendMultiBlockChange(@NotNull Map<? extends io.papermc.paper.math.Position, BlockData> blockChanges) {
+ this.sendMultiBlockChange(blockChanges, false);
+ }
+ void sendMultiBlockChange(@NotNull Map<? extends io.papermc.paper.math.Position, BlockData> blockChanges);
+
+ /**
+ * Send multiple block changes. This fakes a multi block change packet for each
@ -29,8 +27,12 @@ index 529b2a524dafa17fdaa8dedaf551aec114a5cb7f..d2b2660eb8c4302fc46de8cdc4bc5227
+ *
+ * @param blockChanges A map of the positions you want to change to their new block data
+ * @param suppressLightUpdates Whether to suppress light updates or not
+ * @deprecated suppressLightUpdates is no longer available in 1.20+, use {@link #sendMultiBlockChange(Map)}
+ */
+ void sendMultiBlockChange(@NotNull Map<? extends io.papermc.paper.math.Position, BlockData> blockChanges, boolean suppressLightUpdates);
+ @Deprecated
+ default void sendMultiBlockChange(@NotNull Map<? extends io.papermc.paper.math.Position, BlockData> blockChanges, boolean suppressLightUpdates) {
+ this.sendMultiBlockChange(blockChanges);
+ }
+ // Paper end
+
/**

4
patches/api/0371-More-Teleport-API.patch
View file

@ -165,10 +165,10 @@ index ab0ceaba9ddcbe20a8b8a1fc3ed19cb3c64ecd3d..97f0bc6573c8ba09de77061b6312b91c
* Teleports this entity to the given location. If this entity is riding a
* vehicle, it will be dismounted prior to teleportation.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index d2b2660eb8c4302fc46de8cdc4bc522714d13c8f..e2e73dd0b75b9a5eb7175ae8b3cfce29c95d8510 100644
index 795984fbdd433b30e3680b3d3ae436944c86e533..1e133186a1150fc78ee15bfd63044d366cbaa485 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2877,6 +2877,49 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2879,6 +2879,49 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
String getClientBrandName();
// Paper end

4
patches/api/0373-Custom-Chat-Completion-Suggestions-API.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Custom Chat Completion Suggestions API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index e2e73dd0b75b9a5eb7175ae8b3cfce29c95d8510..fcd729614bdd8f01481d5db71e817ad1c31ae206 100644
index 1e133186a1150fc78ee15bfd63044d366cbaa485..ff6006728406b10307742d4e773ba091aa6de137 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2764,6 +2764,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2766,6 +2766,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @throws IllegalArgumentException If the level is negative or greater than {@code 4} (i.e. not within {@code [0, 4]}).
*/
void sendOpLevel(byte level);

4
patches/api/0383-Elder-Guardian-appearance-API.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Elder Guardian appearance API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index fcd729614bdd8f01481d5db71e817ad1c31ae206..90733cb910e93a997525d955c4236db03cdbbcfb 100644
index ff6006728406b10307742d4e773ba091aa6de137..c7595ad428711794b9459252d1cc6a2b3da065dd 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2939,6 +2939,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2941,6 +2941,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
void lookAt(@NotNull org.bukkit.entity.Entity entity, @NotNull io.papermc.paper.entity.LookAnchor playerAnchor, @NotNull io.papermc.paper.entity.LookAnchor entityAnchor);
// Paper end - Teleport API

4
patches/api/0391-Add-Player-Warden-Warning-API.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Add Player Warden Warning API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 90733cb910e93a997525d955c4236db03cdbbcfb..107845269618697e06b2e3b7507a70431643274c 100644
index c7595ad428711794b9459252d1cc6a2b3da065dd..f2a22762c6394dca172289c8d8e15c2de8cff917 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2955,6 +2955,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2957,6 +2957,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param silent whether sound should be silenced
*/
void showElderGuardian(boolean silent);

2
patches/api/0399-fix-Instruments.patch
View file

@ -98,7 +98,7 @@ index de976be7132d05506fde7a839cac3954b0dd8da4..642feb8b4578e6dbd2bf78d859283d20
public static Instrument getByType(final byte type) {
return BY_DATA.get(type);
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 107845269618697e06b2e3b7507a70431643274c..4dc268e55e2f2efc90b1899832d3194aa27e7779 100644
index f2a22762c6394dca172289c8d8e15c2de8cff917..4ac55bbc23fa3093ada14ee12122e0a93e06863b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -393,9 +393,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

2
patches/api/0401-Add-Sneaking-API-for-Entities.patch
View file

@ -35,7 +35,7 @@ index 3f3ea5bb6b3ea6f55b5cd699f1c01ac159619add..a2a423d4e4c2702ba5967223cab0432d
* Get the category of spawn to which this entity belongs.
*
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 4dc268e55e2f2efc90b1899832d3194aa27e7779..7808491e895fbfb0fa9608259b765c53087b8f28 100644
index 4ac55bbc23fa3093ada14ee12122e0a93e06863b..50b6809939dc77b94aa13df29bcd2721220456cb 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -296,6 +296,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

4
patches/api/0404-Flying-Fall-Damage-API.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Flying Fall Damage API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 7808491e895fbfb0fa9608259b765c53087b8f28..1c6d6bba2e828dae703d697e139d69c6422ead8b 100644
index 50b6809939dc77b94aa13df29bcd2721220456cb..fa638e80b76521f90d36b4665d51624dbd6167fd 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1534,6 +1534,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1536,6 +1536,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void setAllowFlight(boolean flight);

4
patches/api/0407-Win-Screen-API.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Win Screen API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 1c6d6bba2e828dae703d697e139d69c6422ead8b..a5be783b06f97d45897a359db4e2f213343adebc 100644
index fa638e80b76521f90d36b4665d51624dbd6167fd..997afb6739c72529ea8226228a9905d72f77c89a 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -901,6 +901,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -903,6 +903,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void sendMap(@NotNull MapView map);