Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 10:57:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Pufferfish)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@26734e8 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7454)
PaperMC/Paper@4a745f9 Optimize Util#sequence (#7115)
PaperMC/Paper@2c8d48c Make Panda implement Sittable (#7414)
PaperMC/Paper@2c4a589 Fix issues with LimitedRegion (#7343)
PaperMC/Paper@3d91eca Fix cancelled snow bucket placement (#6751)
PaperMC/Paper@9567753 Don't load plugins prefixed with a dot (#7392)
PaperMC/Paper@92c777d Fix PlayerProfile BukkitObject serialization, deprecate setName and setId for removal (#7471)
PaperMC/Paper@e6898ff Fix IllegalArgumentException for /paper mobcaps command (#7472)
PaperMC/Paper@a8f2d67 - properly fix IllegalArgumentException in `/paper mobcaps` command

Pufferfish Changes:
pufferfish-gg/Pufferfish@22f20b2 Fix sentry bug
This commit is contained in:
BillyGalbreath
2022-02-13 20:37:07 -06:00
parent 5d1684a84c
commit cfe8efe1f0
51 changed files with 258 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
patches/api/0033-Conflict-on-change-for-adventure-deprecations.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Conflict on change for adventure deprecations
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 1c24ef085669d7d0cc8d67b661e900b172f4b99a..a046ba83697ef7e3b9dd0034920a84912e0f5f0b 100644
index 4a18f9ffddf37dcbdca7655da1fab1cf0a878ab9..ae21cdd6ff22cca2a725670d9c0023d85154cb33 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -413,7 +413,7 @@ public final class Bukkit {
@@ -415,7 +415,7 @@ public final class Bukkit {
* @return the number of players
* @deprecated in favour of {@link Server#broadcast(net.kyori.adventure.text.Component)}
*/
@@ -17,7 +17,7 @@ index 1c24ef085669d7d0cc8d67b661e900b172f4b99a..a046ba83697ef7e3b9dd0034920a8491
public static int broadcastMessage(@NotNull String message) {
return server.broadcastMessage(message);
}
@@ -1142,7 +1142,7 @@ public final class Bukkit {
@@ -1182,7 +1182,7 @@ public final class Bukkit {
* @return number of message recipients
* @deprecated in favour of {@link #broadcast(net.kyori.adventure.text.Component, String)}
*/
@@ -26,7 +26,7 @@ index 1c24ef085669d7d0cc8d67b661e900b172f4b99a..a046ba83697ef7e3b9dd0034920a8491
public static int broadcast(@NotNull String message, @NotNull String permission) {
return server.broadcast(message, permission);
}
@@ -1435,7 +1435,7 @@ public final class Bukkit {
@@ -1517,7 +1517,7 @@ public final class Bukkit {
*
* @see InventoryType#isCreatable()
*/
@@ -35,7 +35,7 @@ index 1c24ef085669d7d0cc8d67b661e900b172f4b99a..a046ba83697ef7e3b9dd0034920a8491
@NotNull
public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) {
return server.createInventory(owner, type, title);
@@ -1485,7 +1485,7 @@ public final class Bukkit {
@@ -1567,7 +1567,7 @@ public final class Bukkit {
* @throws IllegalArgumentException if the size is not a multiple of 9
* @deprecated in favour of {@link #createInventory(InventoryHolder, InventoryType, net.kyori.adventure.text.Component)}
*/
@@ -44,7 +44,7 @@ index 1c24ef085669d7d0cc8d67b661e900b172f4b99a..a046ba83697ef7e3b9dd0034920a8491
@NotNull
public static Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException {
return server.createInventory(owner, size, title);
@@ -1512,7 +1512,7 @@ public final class Bukkit {
@@ -1594,7 +1594,7 @@ public final class Bukkit {
* @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)}
*/
@NotNull
@@ -53,7 +53,7 @@ index 1c24ef085669d7d0cc8d67b661e900b172f4b99a..a046ba83697ef7e3b9dd0034920a8491
public static Merchant createMerchant(@Nullable String title) {
return server.createMerchant(title);
}
@@ -1610,7 +1610,7 @@ public final class Bukkit {
@@ -1718,7 +1718,7 @@ public final class Bukkit {
* @deprecated in favour of {@link #motd()}
*/
@NotNull
@@ -62,7 +62,7 @@ index 1c24ef085669d7d0cc8d67b661e900b172f4b99a..a046ba83697ef7e3b9dd0034920a8491
public static String getMotd() {
return server.getMotd();
}
@@ -1632,7 +1632,7 @@ public final class Bukkit {
@@ -1740,7 +1740,7 @@ public final class Bukkit {
* @deprecated in favour of {@link #shutdownMessage()}
*/
@Nullable
@@ -72,10 +72,10 @@ index 1c24ef085669d7d0cc8d67b661e900b172f4b99a..a046ba83697ef7e3b9dd0034920a8491
return server.getShutdownMessage();
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 6e4ef6de10442f73ca7bd1c48496d920c3ef3899..3d9cbd6b37ee932f0b9908e4410107f5a123a551 100644
index 64424da7eae955d9d25da51611cc1f088810f321..be88a4af01680963b9edb205a390018128cb4d13 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -325,7 +325,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -327,7 +327,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return the number of players
* @deprecated use {@link #broadcast(net.kyori.adventure.text.Component)}
*/
@@ -84,7 +84,7 @@ index 6e4ef6de10442f73ca7bd1c48496d920c3ef3899..3d9cbd6b37ee932f0b9908e4410107f5
public int broadcastMessage(@NotNull String message);
// Paper start
@@ -926,7 +926,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -963,7 +963,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return number of message recipients
* @deprecated in favour of {@link #broadcast(net.kyori.adventure.text.Component, String)}
*/
@@ -93,7 +93,7 @@ index 6e4ef6de10442f73ca7bd1c48496d920c3ef3899..3d9cbd6b37ee932f0b9908e4410107f5
public int broadcast(@NotNull String message, @NotNull String permission);
// Paper start
/**
@@ -1202,7 +1202,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1275,7 +1275,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*
* @see InventoryType#isCreatable()
*/
@@ -102,7 +102,7 @@ index 6e4ef6de10442f73ca7bd1c48496d920c3ef3899..3d9cbd6b37ee932f0b9908e4410107f5
@NotNull
Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title);
@@ -1246,7 +1246,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1319,7 +1319,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @throws IllegalArgumentException if the size is not a multiple of 9
* @deprecated in favour of {@link #createInventory(InventoryHolder, int, net.kyori.adventure.text.Component)}
*/
@@ -111,7 +111,7 @@ index 6e4ef6de10442f73ca7bd1c48496d920c3ef3899..3d9cbd6b37ee932f0b9908e4410107f5
@NotNull
Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException;
@@ -1269,7 +1269,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1342,7 +1342,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)}
*/
@NotNull
@@ -120,7 +120,7 @@ index 6e4ef6de10442f73ca7bd1c48496d920c3ef3899..3d9cbd6b37ee932f0b9908e4410107f5
Merchant createMerchant(@Nullable String title);
/**
@@ -1349,7 +1349,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1445,7 +1445,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @deprecated in favour of {@link #motd()}
*/
@NotNull
@@ -129,7 +129,7 @@ index 6e4ef6de10442f73ca7bd1c48496d920c3ef3899..3d9cbd6b37ee932f0b9908e4410107f5
String getMotd();
// Paper start
@@ -1367,7 +1367,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1463,7 +1463,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @deprecated in favour of {@link #shutdownMessage()}
*/
@Nullable
@@ -170,10 +170,10 @@ index c8d37184d8e882a4084a1bfef85faa330588600b..46bae5c13ce2b973b114682f6a338981
/**
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 949f522266159fdcf4803fb62bcfdd979470a579..38c55785f661b85ce8ba4f8bdd2eb41e73ad7fa1 100644
index 68fb6c2a92e27b42703c00139df7f88eafa74652..3383aab3f98f089425c9db10057533dff28cc8d4 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -76,7 +76,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -71,7 +71,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return the friendly name
* @deprecated in favour of {@link #displayName()}
*/
@@ -182,7 +182,7 @@ index 949f522266159fdcf4803fb62bcfdd979470a579..38c55785f661b85ce8ba4f8bdd2eb41e
@NotNull
public String getDisplayName();
@@ -90,7 +90,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -85,7 +85,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param name The new display name.
* @deprecated in favour of {@link #displayName(net.kyori.adventure.text.Component)}
*/
@@ -191,7 +191,7 @@ index 949f522266159fdcf4803fb62bcfdd979470a579..38c55785f661b85ce8ba4f8bdd2eb41e
public void setDisplayName(@Nullable String name);
// Paper start
@@ -131,7 +131,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -126,7 +126,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @deprecated in favour of {@link #playerListName()}
*/
@NotNull
@@ -200,7 +200,7 @@ index 949f522266159fdcf4803fb62bcfdd979470a579..38c55785f661b85ce8ba4f8bdd2eb41e
public String getPlayerListName();
/**
@@ -142,7 +142,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -137,7 +137,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param name new player list name
* @deprecated in favour of {@link #playerListName(net.kyori.adventure.text.Component)}
*/
@@ -209,7 +209,7 @@ index 949f522266159fdcf4803fb62bcfdd979470a579..38c55785f661b85ce8ba4f8bdd2eb41e
public void setPlayerListName(@Nullable String name);
/**
@@ -151,7 +151,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -146,7 +146,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return player list header or null
* @deprecated in favour of {@link #playerListHeader()}
*/
@@ -218,7 +218,7 @@ index 949f522266159fdcf4803fb62bcfdd979470a579..38c55785f661b85ce8ba4f8bdd2eb41e
@Nullable
public String getPlayerListHeader();
@@ -161,7 +161,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -156,7 +156,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return player list header or null
* @deprecated in favour of {@link #playerListFooter()}
*/
@@ -227,7 +227,7 @@ index 949f522266159fdcf4803fb62bcfdd979470a579..38c55785f661b85ce8ba4f8bdd2eb41e
@Nullable
public String getPlayerListFooter();
@@ -171,7 +171,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -166,7 +166,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param header player list header, null for empty
* @deprecated in favour of {@link #sendPlayerListHeader(net.kyori.adventure.text.Component)}
*/
@@ -236,7 +236,7 @@ index 949f522266159fdcf4803fb62bcfdd979470a579..38c55785f661b85ce8ba4f8bdd2eb41e
public void setPlayerListHeader(@Nullable String header);
/**
@@ -180,7 +180,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -175,7 +175,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param footer player list footer, null for empty
* @deprecated in favour of {@link #sendPlayerListFooter(net.kyori.adventure.text.Component)}
*/
@@ -245,7 +245,7 @@ index 949f522266159fdcf4803fb62bcfdd979470a579..38c55785f661b85ce8ba4f8bdd2eb41e
public void setPlayerListFooter(@Nullable String footer);
/**
@@ -191,7 +191,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -186,7 +186,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param footer player list footer, null for empty
* @deprecated in favour of {@link #sendPlayerListHeaderAndFooter(net.kyori.adventure.text.Component, net.kyori.adventure.text.Component)}
*/
@@ -254,7 +254,7 @@ index 949f522266159fdcf4803fb62bcfdd979470a579..38c55785f661b85ce8ba4f8bdd2eb41e
public void setPlayerListHeaderFooter(@Nullable String header, @Nullable String footer);
/**
@@ -231,7 +231,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -226,7 +226,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param message kick message
* @deprecated in favour of {@link #kick(net.kyori.adventure.text.Component)}
*/
@@ -263,7 +263,7 @@ index 949f522266159fdcf4803fb62bcfdd979470a579..38c55785f661b85ce8ba4f8bdd2eb41e
public void kickPlayer(@Nullable String message);
// Paper start
@@ -716,7 +716,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -711,7 +711,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @throws IllegalArgumentException if lines is non-null and has a length less than 4
* @deprecated in favour of {@link #sendSignChange(org.bukkit.Location, java.util.List)}
*/
@@ -272,7 +272,7 @@ index 949f522266159fdcf4803fb62bcfdd979470a579..38c55785f661b85ce8ba4f8bdd2eb41e
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines) throws IllegalArgumentException;
/**
@@ -737,7 +737,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -732,7 +732,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @throws IllegalArgumentException if lines is non-null and has a length less than 4
* @deprecated in favour of {@link #sendSignChange(org.bukkit.Location, java.util.List, org.bukkit.DyeColor)}
*/
@@ -281,7 +281,7 @@ index 949f522266159fdcf4803fb62bcfdd979470a579..38c55785f661b85ce8ba4f8bdd2eb41e
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException;
/**
@@ -2213,7 +2213,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2208,7 +2208,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @deprecated in favour of {@link #locale()}
*/
@NotNull