Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +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

12
patches/api/0001-Pufferfish-API-Changes.patch
View File

@@ -407,10 +407,10 @@ index b937441d2fb46b108644c49fcf073859765aa02e..d95b01bfd0657cf089c0f5412453cca0
}
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 1366496271c4c7f72d1e5f990e51775b1c371f99..05bb388407b5bd8a942478237580a38ffaa388c8 100644
index 42da20011544075a9bea63a12ae86f2f21720667..16d0e517afd3fae21f2666c6b4e1e38dcf5ea64b 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -581,7 +581,9 @@ public final class SimplePluginManager implements PluginManager {
@@ -582,7 +582,9 @@ public final class SimplePluginManager implements PluginManager {
// Paper start
private void handlePluginException(String msg, Throwable ex, Plugin plugin) {
@@ -420,7 +420,7 @@ index 1366496271c4c7f72d1e5f990e51775b1c371f99..05bb388407b5bd8a942478237580a38f
callEvent(new ServerExceptionEvent(new ServerPluginEnableDisableException(msg, ex, plugin)));
}
// Paper end
@@ -640,14 +642,16 @@ public final class SimplePluginManager implements PluginManager {
@@ -641,9 +643,11 @@ public final class SimplePluginManager implements PluginManager {
));
}
} catch (Throwable ex) {
@@ -432,12 +432,6 @@ index 1366496271c4c7f72d1e5f990e51775b1c371f99..05bb388407b5bd8a942478237580a38f
if (!(event instanceof ServerExceptionEvent)) { // We don't want to cause an endless event loop
callEvent(new ServerExceptionEvent(new ServerEventException(msg, ex, registration.getPlugin(), registration.getListener(), event)));
}
// Paper end
- }
+ } finally { gg.pufferfish.pufferfish.sentry.SentryContext.removeEventContext(); } // Pufferfish
}
}
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index c8b11793c6a3baabc1c9566e0463ab1d6e293827..2b9218ddd262e89180588c3014dad328317dd8db 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java

4
patches/api/0004-Purpur-config-files.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 73446141e8c50b71a17ff6f0c528a62d5c75751b..85b6174f9ede8929e6931a125de03922755997f5 100644
index a62c27777672eff1c488517b37876e3a44a2d57d..d55ee1f892bb37836acd7204a92962a79b0b76b1 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1790,6 +1790,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1886,6 +1886,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
}
// Paper end

4
patches/api/0005-Purpur-client-support.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index ec1e115879c4f6608e8ba764ed87063577ee44b0..3c96189fae0426b570a4e69ad467a6b4b5066e26 100644
index 131daee2b29f7016463a00ce7927dff7b0a1b1b4..6a3c22efa63133b8144b8a20e591c30ae00ab7d2 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2657,4 +2657,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2652,4 +2652,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end

4
patches/api/0007-Ridables.patch
View File

@@ -22,10 +22,10 @@ index 2405254739a83b2fb517da7fa4ea0721c68f9f6d..dc0535d5ea5b2f4002a428ec64ea52fe
* @deprecated removed in 1.16
*/
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index c2c45a93887f99466a8ac4275355ac75c7f901c4..768cfcbf9b780a00aa93247ee43bd51eb636c2e7 100644
index 8bc6876c82935988436597161fa0ec94c032174b..db83f87af0cb75b275bba306dea38b66907bbb56 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -822,4 +822,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -830,4 +830,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
boolean isInPowderedSnow();
// Paper end

4
patches/api/0010-AFK-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 3c96189fae0426b570a4e69ad467a6b4b5066e26..2a23cd71d6d9c8835a3c34199a75e3e7f992d64e 100644
index 6a3c22efa63133b8144b8a20e591c30ae00ab7d2..75680d1b3bd7640ae9f72ec7b0b794689e7c2cb6 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2665,5 +2665,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2660,5 +2660,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return True if Player uses Purpur Client
*/
public boolean usesPurpurClient();

8
patches/api/0011-Bring-back-server-name.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 3a8326735b62521f8fb95c51a0909d8b7bac83d1..5d76861b8745c7b5d7a67391c110ca12c0533966 100644
index 795f8c0aa3929f6de4b4ea4b139bef8b672ab97a..873c264e04b9bec15b79136b612532ee8b6ca9d9 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2195,4 +2195,15 @@ public final class Bukkit {
@@ -2303,4 +2303,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -25,10 +25,10 @@ index 3a8326735b62521f8fb95c51a0909d8b7bac83d1..5d76861b8745c7b5d7a67391c110ca12
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 85b6174f9ede8929e6931a125de03922755997f5..eaabd077d1a819cf074fbae40bccc9364b1a49d3 100644
index d55ee1f892bb37836acd7204a92962a79b0b76b1..cb835dfa9110f50faf6a5972b2a0c9f52d88f073 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1912,4 +1912,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2008,4 +2008,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
io.papermc.paper.datapack.DatapackManager getDatapackManager();
// Paper end

8
patches/api/0014-Lagging-threshold.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 5d76861b8745c7b5d7a67391c110ca12c0533966..1c24ef085669d7d0cc8d67b661e900b172f4b99a 100644
index 873c264e04b9bec15b79136b612532ee8b6ca9d9..4a18f9ffddf37dcbdca7655da1fab1cf0a878ab9 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2205,5 +2205,14 @@ public final class Bukkit {
@@ -2313,5 +2313,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index 5d76861b8745c7b5d7a67391c110ca12c0533966..1c24ef085669d7d0cc8d67b661e900b1
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index eaabd077d1a819cf074fbae40bccc9364b1a49d3..fc5b0ebb0d71dc4728b95297a50ac61e2f2d58bf 100644
index cb835dfa9110f50faf6a5972b2a0c9f52d88f073..ab3fd921462f9102480b9da0965c4b2a23af244a 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1920,5 +1920,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2016,5 +2016,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();

4
patches/api/0017-Player-invulnerabilities.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 2a23cd71d6d9c8835a3c34199a75e3e7f992d64e..69954244ef59597f4d05964518c2147b334baee6 100644
index 75680d1b3bd7640ae9f72ec7b0b794689e7c2cb6..b07e6709531595b7241ef54754f2450d4561c463 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2684,5 +2684,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2679,5 +2679,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();

26
patches/api/0029-Fix-javadoc-warnings-missing-param-and-return.patch
View File

@@ -475,10 +475,10 @@ index 2acdf2a6d3955923c721222b9da784f3278f6418..737c3b053060e38f6776a5a508948cc3
// Paper start
diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
index 3afd5f5c0208a4ee93b5dbfc2aab2b9d2e8a7544..7838731e0e16bdccfb79e74ceb64148f7c52db79 100644
index 23e853bae0e051cd43deb9eb24c54e74a56d8ab0..6df8e7b6672a26f123efc3aac1541b870c57e1b5 100644
--- a/src/main/java/org/bukkit/OfflinePlayer.java
+++ b/src/main/java/org/bukkit/OfflinePlayer.java
@@ -9,6 +9,9 @@ import org.bukkit.permissions.ServerOperator;
@@ -10,6 +10,9 @@ import org.bukkit.profile.PlayerProfile;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -489,10 +489,10 @@ index 3afd5f5c0208a4ee93b5dbfc2aab2b9d2e8a7544..7838731e0e16bdccfb79e74ceb64148f
/**
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index fc5b0ebb0d71dc4728b95297a50ac61e2f2d58bf..6e4ef6de10442f73ca7bd1c48496d920c3ef3899 100644
index ab3fd921462f9102480b9da0965c4b2a23af244a..64424da7eae955d9d25da51611cc1f088810f321 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1763,6 +1763,9 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1859,6 +1859,9 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
UnsafeValues getUnsafe();
// Spigot start
@@ -790,11 +790,11 @@ index 9e7f42caab1204036f4203354c115fd40c6def92..f76ddd80f9fc926f73b1cc50f0a2767a
/**
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 768cfcbf9b780a00aa93247ee43bd51eb636c2e7..5c65100b8f442c5e034531b0ae16b2e1fe5d3e0f 100644
index db83f87af0cb75b275bba306dea38b66907bbb56..0e6d7d890ea12028d61af492fc0b9f74ad9e1994 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -688,6 +688,9 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
Pose getPose();
@@ -696,6 +696,9 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
SpawnCategory getSpawnCategory();
// Spigot start
+ /**
@@ -803,7 +803,7 @@ index 768cfcbf9b780a00aa93247ee43bd51eb636c2e7..5c65100b8f442c5e034531b0ae16b2e1
public class Spigot extends CommandSender.Spigot {
}
@@ -748,36 +751,50 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -756,36 +759,50 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
/**
* Check if entity is in rain
@@ -910,10 +910,10 @@ index 6f5b6901032eb03606c4566b24459a03baac0c73..9dc1f27d3b36e112d2e79d93b3e49c39
/*
diff --git a/src/main/java/org/bukkit/entity/Panda.java b/src/main/java/org/bukkit/entity/Panda.java
index 9d065625be5931d970d7f34e1225fae1af960314..de3ebfa362ee4d8147bb68c7c115fdfb4eb55143 100644
index 1dcc2c8f4899da029af8b1c1b2ff1b5e368e82c1..c5f49f3f82fd259a1c795b59e83c3d9f56c98344 100644
--- a/src/main/java/org/bukkit/entity/Panda.java
+++ b/src/main/java/org/bukkit/entity/Panda.java
@@ -37,6 +37,9 @@ public interface Panda extends Animals {
@@ -37,6 +37,9 @@ public interface Panda extends Animals, Sittable { // Paper
*/
void setHiddenGene(@NotNull Gene gene);
@@ -924,10 +924,10 @@ index 9d065625be5931d970d7f34e1225fae1af960314..de3ebfa362ee4d8147bb68c7c115fdfb
NORMAL(false),
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 69954244ef59597f4d05964518c2147b334baee6..949f522266159fdcf4803fb62bcfdd979470a579 100644
index b07e6709531595b7241ef54754f2450d4561c463..68fb6c2a92e27b42703c00139df7f88eafa74652 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2487,6 +2487,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2482,6 +2482,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
void resetCooldown();
/**
@@ -936,7 +936,7 @@ index 69954244ef59597f4d05964518c2147b334baee6..949f522266159fdcf4803fb62bcfdd97
* @return the client option value of the player
*/
@NotNull
@@ -2518,6 +2520,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2513,6 +2515,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
// Paper end
// Spigot start

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

4
patches/api/0036-API-for-any-mob-to-burn-daylight.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight
Co-authored by: Encode42 <me@encode42.dev>
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 5c65100b8f442c5e034531b0ae16b2e1fe5d3e0f..f0254799088d5343ef5c0c0a2841a6b51f17d14f 100644
index 0e6d7d890ea12028d61af492fc0b9f74ad9e1994..26847ed7bae8ae4e0a21106a0ff09a50af6ce689 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -869,5 +869,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -877,5 +877,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
* @return True if ridable in water
*/
boolean isRidableInWater();

4
patches/api/0037-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 38c55785f661b85ce8ba4f8bdd2eb41e73ad7fa1..c642889243590e76a953182db4e04208dcefce3e 100644
index 3383aab3f98f089425c9db10057533dff28cc8d4..6e95dbe19df37b67dfb497e0ac37bfeccdcbd38c 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2710,5 +2710,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2705,5 +2705,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param invulnerableTicks Invulnerable ticks remaining
*/
void setSpawnInvulnerableTicks(int invulnerableTicks);

4
patches/api/0042-Extended-OfflinePlayer-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Extended OfflinePlayer API
diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
index 7838731e0e16bdccfb79e74ceb64148f7c52db79..8ea59406ddb2293af66719a893e6f13d8377b81e 100644
index 6df8e7b6672a26f123efc3aac1541b870c57e1b5..409aa7c39ce28f275390e11b917040039f31f1d3 100644
--- a/src/main/java/org/bukkit/OfflinePlayer.java
+++ b/src/main/java/org/bukkit/OfflinePlayer.java
@@ -437,4 +437,114 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
@@ -450,4 +450,114 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
* for the statistic
*/
public void setStatistic(@NotNull Statistic statistic, @NotNull EntityType entityType, int newValue);

8
patches/api/0043-Added-the-ability-to-add-combustible-items.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Added the ability to add combustible items
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index a046ba83697ef7e3b9dd0034920a84912e0f5f0b..c6d9a42f02cb538ee3739cd01f0a22203c9ceb41 100644
index ae21cdd6ff22cca2a725670d9c0023d85154cb33..528e0efb7ff16a1810a6de65ad7ce13223c135f4 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2214,5 +2214,24 @@ public final class Bukkit {
@@ -2322,5 +2322,24 @@ public final class Bukkit {
public static boolean isLagging() {
return server.isLagging();
}
@@ -34,10 +34,10 @@ index a046ba83697ef7e3b9dd0034920a84912e0f5f0b..c6d9a42f02cb538ee3739cd01f0a2220
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 3d9cbd6b37ee932f0b9908e4410107f5a123a551..1a38b9e616c6096d8d64c8abaa7178bc5f84e8d4 100644
index be88a4af01680963b9edb205a390018128cb4d13..47439c4667e6af38b3cf10da7c99d9bbc9c0700c 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1930,5 +1930,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2026,5 +2026,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return True if lagging
*/
boolean isLagging();