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

Updated Upstream (Bukkit/CraftBukkit/Spigot)

Browse source 
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:
64c8bd39 #679: Add getHideOnlinePlayers
b991b6c7 #677: Add "Allow Server Listings" API
4e9f199a SPIGOT-6801: Wrong BlockData classes in Material enum for SOUL_FIRE and SOUL_TORCH

CraftBukkit Changes:
37e63e63 Fix loading / creating secondary worlds (nether/end)
4bf7f33c #956: Add getHideOnlinePlayers
d181e1ed Fix serializing unhandled NBT + add unit test with unhandled NBT
aebb79e3 #954: Add "Allow Server Listings" API
7c4707e4 #955: Add test for BlockData class of Material

Spigot Changes:
16c0cb41 Rebuild patches
This commit is contained in:
MiniDigger 2021-11-23 06:49:33 +01:00 committed by MiniDigger | Martin
parent c93f56ac1c
commit 79b873c901
36 changed files with 137 additions and 137 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
patches/api/0006-Timings-v2.patch
View file

@ -2782,7 +2782,7 @@ index 0000000000000000000000000000000000000000..5989ee21297935651b0edd44b8239e65
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index f65cc41dd20342d532d3fc44a1b3ec5541f39e19..e0ee875391d0296a00c53bbec2935fa1fc1af731 100644
index 806aeee78956fc79fda62c706f40d3edd2ef8388..a238302f2a12194aa30a88867070705dc749b36b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -704,7 +704,6 @@ public final class Bukkit {
@ -2794,10 +2794,10 @@ index f65cc41dd20342d532d3fc44a1b3ec5541f39e19..e0ee875391d0296a00c53bbec2935fa1
/**
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index baccaea5689ae745d2a5292a2b114704d0bb1758..bfd003c5acf1b06378c7ee107c73471ad18e6675 100644
index 70d711b51e6bb3860c17e631fe5892b6bde9b245..3e91c4000c468fd8bdcb938e942a7bbf4988cab2 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1458,6 +1458,26 @@ public interface Server extends PluginMessageRecipient {
@@ -1465,6 +1465,26 @@ public interface Server extends PluginMessageRecipient {
throw new UnsupportedOperationException("Not supported yet.");
}
@ -3377,10 +3377,10 @@ index 2a145d851ce30360aa39549745bd87590c034584..00000000000000000000000000000000
- // Spigot end
-}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index a0511e4cc71aa3aa7b2f24f19805d84b19cf947a..8b6cd8f61e1ca03797a26e7549b492a3279dbaa4 100644
index 2be4482640e15ea0b621b3655a5cb3ed01d15c3e..ad1a3148b05f4fef26c9d587da94e01cdbfa3c3c 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1411,7 +1411,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1418,7 +1418,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");

54
patches/api/0007-Adventure.patch
View file

@ -472,7 +472,7 @@ index 0000000000000000000000000000000000000000..77db592d05b754f879f8d1790642e9d9
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index e0ee875391d0296a00c53bbec2935fa1fc1af731..f2642d518218da9c3fae8a4445cfed8244471d07 100644
index a238302f2a12194aa30a88867070705dc749b36b..b8e63b2c2870dd2eb9d31f51590b9b958de6a17f 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -312,7 +312,9 @@ public final class Bukkit {
@ -485,7 +485,7 @@ index e0ee875391d0296a00c53bbec2935fa1fc1af731..f2642d518218da9c3fae8a4445cfed82
public static int broadcastMessage(@NotNull String message) {
return server.broadcastMessage(message);
}
@@ -946,6 +948,19 @@ public final class Bukkit {
@@ -955,6 +957,19 @@ public final class Bukkit {
server.shutdown();
}
@ -505,7 +505,7 @@ index e0ee875391d0296a00c53bbec2935fa1fc1af731..f2642d518218da9c3fae8a4445cfed82
/**
* Broadcasts the specified message to every user with the given
* permission name.
@@ -955,6 +970,21 @@ public final class Bukkit {
@@ -964,6 +979,21 @@ public final class Bukkit {
* permissibles} must have to receive the broadcast
* @return number of message recipients
*/
@ -527,7 +527,7 @@ index e0ee875391d0296a00c53bbec2935fa1fc1af731..f2642d518218da9c3fae8a4445cfed82
public static int broadcast(@NotNull String message, @NotNull String permission) {
return server.broadcast(message, permission);
}
@@ -1154,6 +1184,7 @@ public final class Bukkit {
@@ -1163,6 +1193,7 @@ public final class Bukkit {
return server.createInventory(owner, type);
}
@ -535,7 +535,7 @@ index e0ee875391d0296a00c53bbec2935fa1fc1af731..f2642d518218da9c3fae8a4445cfed82
/**
* Creates an empty inventory with the specified type and title. If the type
* is {@link InventoryType#CHEST}, the new inventory has a size of 27;
@@ -1179,6 +1210,38 @@ public final class Bukkit {
@@ -1188,6 +1219,38 @@ public final class Bukkit {
* @see InventoryType#isCreatable()
*/
@NotNull
@ -574,7 +574,7 @@ index e0ee875391d0296a00c53bbec2935fa1fc1af731..f2642d518218da9c3fae8a4445cfed82
public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) {
return server.createInventory(owner, type, title);
}
@@ -1197,6 +1260,7 @@ public final class Bukkit {
@@ -1206,6 +1269,7 @@ public final class Bukkit {
return server.createInventory(owner, size);
}
@ -582,7 +582,7 @@ index e0ee875391d0296a00c53bbec2935fa1fc1af731..f2642d518218da9c3fae8a4445cfed82
/**
* Creates an empty inventory of type {@link InventoryType#CHEST} with the
* specified size and title.
@@ -1209,10 +1273,30 @@ public final class Bukkit {
@@ -1218,10 +1282,30 @@ public final class Bukkit {
* @throws IllegalArgumentException if the size is not a multiple of 9
*/
@NotNull
@ -613,7 +613,7 @@ index e0ee875391d0296a00c53bbec2935fa1fc1af731..f2642d518218da9c3fae8a4445cfed82
/**
* Creates an empty merchant.
*
@@ -1220,7 +1304,20 @@ public final class Bukkit {
@@ -1229,7 +1313,20 @@ public final class Bukkit {
* when the merchant inventory is viewed
* @return a new merchant
*/
@ -634,7 +634,7 @@ index e0ee875391d0296a00c53bbec2935fa1fc1af731..f2642d518218da9c3fae8a4445cfed82
public static Merchant createMerchant(@Nullable String title) {
return server.createMerchant(title);
}
@@ -1300,22 +1397,47 @@ public final class Bukkit {
@@ -1309,22 +1406,47 @@ public final class Bukkit {
return server.isPrimaryThread();
}
@ -756,7 +756,7 @@ index 803fa0019869127ee8c7e4fb1777a59c43e66f8a..c65f0d6569c130b4920a9e71ad24af64
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index bfd003c5acf1b06378c7ee107c73471ad18e6675..922ad1a22460c32965291a213175fcb69c34b087 100644
index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..f048278df8abb313a319136e8b697d9c87fb5d0a 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -56,13 +56,13 @@ import org.jetbrains.annotations.Nullable;
@ -794,7 +794,7 @@ index bfd003c5acf1b06378c7ee107c73471ad18e6675..922ad1a22460c32965291a213175fcb6
public int broadcastMessage(@NotNull String message);
/**
@@ -802,8 +804,33 @@ public interface Server extends PluginMessageRecipient {
@@ -809,8 +811,33 @@ public interface Server extends PluginMessageRecipient {
* @param permission the required permission {@link Permissible
* permissibles} must have to receive the broadcast
* @return number of message recipients
@ -828,7 +828,7 @@ index bfd003c5acf1b06378c7ee107c73471ad18e6675..922ad1a22460c32965291a213175fcb6
/**
* Gets the player by the given name, regardless if they are offline or
@@ -968,6 +995,7 @@ public interface Server extends PluginMessageRecipient {
@@ -975,6 +1002,7 @@ public interface Server extends PluginMessageRecipient {
@NotNull
Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type);
@ -836,7 +836,7 @@ index bfd003c5acf1b06378c7ee107c73471ad18e6675..922ad1a22460c32965291a213175fcb6
/**
* Creates an empty inventory with the specified type and title. If the type
* is {@link InventoryType#CHEST}, the new inventory has a size of 27;
@@ -993,6 +1021,36 @@ public interface Server extends PluginMessageRecipient {
@@ -1000,6 +1028,36 @@ public interface Server extends PluginMessageRecipient {
* @see InventoryType#isCreatable()
*/
@NotNull
@ -873,7 +873,7 @@ index bfd003c5acf1b06378c7ee107c73471ad18e6675..922ad1a22460c32965291a213175fcb6
Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title);
/**
@@ -1007,6 +1065,22 @@ public interface Server extends PluginMessageRecipient {
@@ -1014,6 +1072,22 @@ public interface Server extends PluginMessageRecipient {
@NotNull
Inventory createInventory(@Nullable InventoryHolder owner, int size) throws IllegalArgumentException;
@ -896,7 +896,7 @@ index bfd003c5acf1b06378c7ee107c73471ad18e6675..922ad1a22460c32965291a213175fcb6
/**
* Creates an empty inventory of type {@link InventoryType#CHEST} with the
* specified size and title.
@@ -1017,10 +1091,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1024,10 +1098,13 @@ public interface Server extends PluginMessageRecipient {
* viewed
* @return a new inventory
* @throws IllegalArgumentException if the size is not a multiple of 9
@ -910,7 +910,7 @@ index bfd003c5acf1b06378c7ee107c73471ad18e6675..922ad1a22460c32965291a213175fcb6
/**
* Creates an empty merchant.
*
@@ -1028,7 +1105,18 @@ public interface Server extends PluginMessageRecipient {
@@ -1035,7 +1112,18 @@ public interface Server extends PluginMessageRecipient {
* when the merchant inventory is viewed
* @return a new merchant
*/
@ -929,7 +929,7 @@ index bfd003c5acf1b06378c7ee107c73471ad18e6675..922ad1a22460c32965291a213175fcb6
Merchant createMerchant(@Nullable String title);
/**
@@ -1092,20 +1180,41 @@ public interface Server extends PluginMessageRecipient {
@@ -1099,20 +1187,41 @@ public interface Server extends PluginMessageRecipient {
*/
boolean isPrimaryThread();
@ -971,7 +971,7 @@ index bfd003c5acf1b06378c7ee107c73471ad18e6675..922ad1a22460c32965291a213175fcb6
String getShutdownMessage();
/**
@@ -1482,7 +1591,9 @@ public interface Server extends PluginMessageRecipient {
@@ -1489,7 +1598,9 @@ public interface Server extends PluginMessageRecipient {
* Sends the component to the player
*
* @param component the components to send
@ -981,7 +981,7 @@ index bfd003c5acf1b06378c7ee107c73471ad18e6675..922ad1a22460c32965291a213175fcb6
public void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -1491,7 +1602,9 @@ public interface Server extends PluginMessageRecipient {
@@ -1498,7 +1609,9 @@ public interface Server extends PluginMessageRecipient {
* Sends an array of components as a single message to the player
*
* @param components the components to send
@ -1547,7 +1547,7 @@ index 25a6f9313a1953def7470e411b53016f2ca14bef..10cb6088c4618f228c757f4e592b44ed
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 8b6cd8f61e1ca03797a26e7549b492a3279dbaa4..d88613f54f368a27130675c4ea7569646dbe74d7 100644
index ad1a3148b05f4fef26c9d587da94e01cdbfa3c3c..1140c29cffaac3c25f7d2591e5d635d070206041 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -34,7 +34,28 @@ import org.jetbrains.annotations.Nullable;
@ -1888,9 +1888,9 @@ index 8b6cd8f61e1ca03797a26e7549b492a3279dbaa4..d88613f54f368a27130675c4ea756964
public String getLocale();
/**
@@ -1307,6 +1490,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1314,6 +1497,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void openBook(@NotNull ItemStack book);
public boolean isAllowingServerListings();
+ // Paper start
+ @NotNull
@ -1903,7 +1903,7 @@ index 8b6cd8f61e1ca03797a26e7549b492a3279dbaa4..d88613f54f368a27130675c4ea756964
// Spigot start
public class Spigot extends Entity.Spigot {
@@ -1361,11 +1552,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1368,11 +1559,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
throw new UnsupportedOperationException("Not supported yet.");
}
@ -1917,7 +1917,7 @@ index 8b6cd8f61e1ca03797a26e7549b492a3279dbaa4..d88613f54f368a27130675c4ea756964
@Override
public void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");
@@ -1376,7 +1569,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1383,7 +1576,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* @param position the screen position
* @param component the components to send
@ -1927,7 +1927,7 @@ index 8b6cd8f61e1ca03797a26e7549b492a3279dbaa4..d88613f54f368a27130675c4ea756964
public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent component) {
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -1386,7 +1581,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1393,7 +1588,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* @param position the screen position
* @param components the components to send
@ -1937,7 +1937,7 @@ index 8b6cd8f61e1ca03797a26e7549b492a3279dbaa4..d88613f54f368a27130675c4ea756964
public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -1397,7 +1594,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1404,7 +1601,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param position the screen position
* @param sender the sender of the message
* @param component the components to send
@ -1947,7 +1947,7 @@ index 8b6cd8f61e1ca03797a26e7549b492a3279dbaa4..d88613f54f368a27130675c4ea756964
public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent component) {
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -1408,7 +1607,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1415,7 +1614,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param position the screen position
* @param sender the sender of the message
* @param components the components to send

8
patches/api/0009-Add-getTPS-method.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Add getTPS method
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index f2642d518218da9c3fae8a4445cfed8244471d07..1b00047db23e6d002cd7055250a8d909d4e84667 100644
index b8e63b2c2870dd2eb9d31f51590b9b958de6a17f..06d84ca5ce794d264dc50b83283bc09e550b8cb7 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1662,6 +1662,17 @@ public final class Bukkit {
@@ -1671,6 +1671,17 @@ public final class Bukkit {
return server.getEntity(uuid);
}
@ -27,10 +27,10 @@ index f2642d518218da9c3fae8a4445cfed8244471d07..1b00047db23e6d002cd7055250a8d909
* Get the advancement specified by this key.
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 922ad1a22460c32965291a213175fcb69c34b087..8902267811bb2eba0b5f3bfe53d1b6efd4549333 100644
index f048278df8abb313a319136e8b697d9c87fb5d0a..c076053238cd6f1787834ee505497d66a17d3769 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1407,6 +1407,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1414,6 +1414,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@Nullable
Entity getEntity(@NotNull UUID uuid);

8
patches/api/0017-Expose-server-CommandMap.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Expose server CommandMap
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 1b00047db23e6d002cd7055250a8d909d4e84667..574ecfe2e4f576f80b519f04e740fa00530a7cfa 100644
index 06d84ca5ce794d264dc50b83283bc09e550b8cb7..7da8180e4408a233af334a13661ebbc6781318ec 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1846,6 +1846,19 @@ public final class Bukkit {
@@ -1855,6 +1855,19 @@ public final class Bukkit {
return server.getUnsafe();
}
@ -29,10 +29,10 @@ index 1b00047db23e6d002cd7055250a8d909d4e84667..574ecfe2e4f576f80b519f04e740fa00
public static Server.Spigot spigot() {
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 8902267811bb2eba0b5f3bfe53d1b6efd4549333..759237106df6cc2798330be22f7bdb8d18e8f427 100644
index c076053238cd6f1787834ee505497d66a17d3769..ad16ce2f62d6519efe8ec6da94aa2ae255521480 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1417,6 +1417,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1424,6 +1424,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
public double[] getTPS();
// Paper end

4
patches/api/0024-Complete-resource-pack-API.patch
View file

@ -5,7 +5,7 @@ Subject: [PATCH] Complete resource pack API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 9468b955e035e3aa733b62f17417d8e99f37ac9f..e1793f09c84c631c3b281d642f0fbabfffa5fc44 100644
index 12acaa06a00a2a2d0c03e52920bb041af29bc01e..ab25e699ea936e2dae7cce41f850b55a381a6dcb 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1217,7 +1217,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@ -18,7 +18,7 @@ index 9468b955e035e3aa733b62f17417d8e99f37ac9f..e1793f09c84c631c3b281d642f0fbabf
public void setResourcePack(@NotNull String url);
/**
@@ -1730,6 +1732,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1737,6 +1739,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
default net.kyori.adventure.text.event.HoverEvent<net.kyori.adventure.text.event.HoverEvent.ShowEntity> asHoverEvent(final @NotNull java.util.function.UnaryOperator<net.kyori.adventure.text.event.HoverEvent.ShowEntity> op) {
return net.kyori.adventure.text.event.HoverEvent.showEntity(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowEntity.of(this.getType().getKey(), this.getUniqueId(), this.displayName())));
}

8
patches/api/0028-Add-command-to-reload-permissions.yml-and-require-co.patch
View file

@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 9fca4fb1cbf5a098e023eeba947f7cf4a3151a0d..53943694e5e405da02f784e9cff706bc594ae9b0 100644
index 0b6299a586e25f97eb734e650728e50d19ad16ce..308d9cd655c37e8a00bb053ecd2ba2450555158f 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1881,6 +1881,13 @@ public final class Bukkit {
@@ -1890,6 +1890,13 @@ public final class Bukkit {
public static org.bukkit.command.CommandMap getCommandMap() {
return server.getCommandMap();
}
@ -24,10 +24,10 @@ index 9fca4fb1cbf5a098e023eeba947f7cf4a3151a0d..53943694e5e405da02f784e9cff706bc
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index e654e00c145fb6f0ce2238d88de9be5d31fbfa51..6abf31ba07c6973eae6eca1f0d4e352f400a6640 100644
index 797ff4d2b16fba1a423c8dc247fde0ad9199b5c1..51d7ec1b9ede6a1fe11d1bddc7a58213add72cbc 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1663,4 +1663,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1670,4 +1670,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
Spigot spigot();
// Spigot end

8
patches/api/0041-Allow-Reloading-of-Command-Aliases.patch
View file

@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
Reload the aliases stored in commands.yml
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 53943694e5e405da02f784e9cff706bc594ae9b0..cd00a5b384413dc74b7d500155765e9df64b534f 100644
index 308d9cd655c37e8a00bb053ecd2ba2450555158f..356a270e9f831e21dc7fd947c2bec72e0840145a 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1888,6 +1888,15 @@ public final class Bukkit {
@@ -1897,6 +1897,15 @@ public final class Bukkit {
public static void reloadPermissions() {
server.reloadPermissions();
}
@ -26,10 +26,10 @@ index 53943694e5e405da02f784e9cff706bc594ae9b0..cd00a5b384413dc74b7d500155765e9d
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 6abf31ba07c6973eae6eca1f0d4e352f400a6640..e6ce7b4de58a3d4ec5293d26637a0e6468bacc32 100644
index 51d7ec1b9ede6a1fe11d1bddc7a58213add72cbc..c0bd764744b101856ef4fa068b5218688b156ecf 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1665,4 +1665,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1672,4 +1672,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
// Spigot end
void reloadPermissions(); // Paper

6
patches/api/0044-Add-String-based-Action-Bar-API.patch
View file

@ -5,7 +5,7 @@ Subject: [PATCH] Add String based Action Bar API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index e1793f09c84c631c3b281d642f0fbabfffa5fc44..aafceef3e547c4883a3015b5705215d44415629c 100644
index ab25e699ea936e2dae7cce41f850b55a381a6dcb..82e4b89bf280ad3f99d94c9aaa6075449737932a 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3,6 +3,7 @@ package org.bukkit.entity;
@ -68,7 +68,7 @@ index e1793f09c84c631c3b281d642f0fbabfffa5fc44..aafceef3e547c4883a3015b5705215d4
public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
spigot().sendMessage(position, components);
}
@@ -1921,6 +1957,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1928,6 +1964,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
/**
* Sends the component to the specified screen position of this player
*
@ -76,7 +76,7 @@ index e1793f09c84c631c3b281d642f0fbabfffa5fc44..aafceef3e547c4883a3015b5705215d4
* @param position the screen position
* @param component the components to send
* @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
@@ -1933,6 +1970,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1940,6 +1977,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
/**
* Sends an array of components as a single message to the specified screen position of this player
*

8
patches/api/0052-Add-configuration-option-to-prevent-player-names-fro.patch
View file

@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index cd00a5b384413dc74b7d500155765e9df64b534f..72fae80603a13000c86c23a4da9f4fae07c94c5b 100644
index 356a270e9f831e21dc7fd947c2bec72e0840145a..282bd71697aff52d43bce0a3543a3ec50a5b7b1b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1897,6 +1897,16 @@ public final class Bukkit {
@@ -1906,6 +1906,16 @@ public final class Bukkit {
public static boolean reloadCommandAliases() {
return server.reloadCommandAliases();
}
@ -27,10 +27,10 @@ index cd00a5b384413dc74b7d500155765e9df64b534f..72fae80603a13000c86c23a4da9f4fae
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index e6ce7b4de58a3d4ec5293d26637a0e6468bacc32..134f52d5c31ba30e1833aeb171c724bff45dc64a 100644
index c0bd764744b101856ef4fa068b5218688b156ecf..2de18d69ad80fe872b36a4975b354cb144b3a302 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1667,4 +1667,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1674,4 +1674,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
void reloadPermissions(); // Paper
boolean reloadCommandAliases(); // Paper

10
patches/api/0053-Fix-upstream-javadocs.patch
View file

@ -6,10 +6,10 @@ Subject: [PATCH] Fix upstream javadocs
Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 72fae80603a13000c86c23a4da9f4fae07c94c5b..6a264819bfed8e5cfc8f088e831fb44d761dd223 100644
index 282bd71697aff52d43bce0a3543a3ec50a5b7b1b..fa3cd5395ec29d7c51c792720acbb2394f238c45 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1154,6 +1154,8 @@ public final class Bukkit {
@@ -1163,6 +1163,8 @@ public final class Bukkit {
/**
* Gets every player that has ever played on this server.
@ -19,10 +19,10 @@ index 72fae80603a13000c86c23a4da9f4fae07c94c5b..6a264819bfed8e5cfc8f088e831fb44d
* @return an array containing all previous players
*/
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 134f52d5c31ba30e1833aeb171c724bff45dc64a..72261e9b0bb41471752f7d436c1e3397260c9c23 100644
index 2de18d69ad80fe872b36a4975b354cb144b3a302..d1e5e679e0a7482a87a9a049ed0ce5c1b9891c90 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -973,6 +973,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -980,6 +980,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
/**
* Gets every player that has ever played on this server.
@ -76,7 +76,7 @@ index be9334a8b5fba9181ad63c211697e798be63da25..0514a141cb93a650be38c63d4336d46e
* Instructs this Mob to set the specified LivingEntity as its target.
* <p>
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index aafceef3e547c4883a3015b5705215d44415629c..a9a19307d668549ab16cb00298abac0cc38b8f06 100644
index 82e4b89bf280ad3f99d94c9aaa6075449737932a..4771a1537646217ad0836f7d5ed62940339b44c6 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -727,7 +727,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

8
patches/api/0057-Basic-PlayerProfile-API.patch
View file

@ -267,10 +267,10 @@ index 0000000000000000000000000000000000000000..7b3b6ef533d32169fbeca389bd61cfc6
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 6a264819bfed8e5cfc8f088e831fb44d761dd223..befd34cfdd37451532f14feeba5e728d3f86751a 100644
index fa3cd5395ec29d7c51c792720acbb2394f238c45..6c7b1e172a9acc881ecade6543245e8a64e251f6 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1909,6 +1909,40 @@ public final class Bukkit {
@@ -1918,6 +1918,40 @@ public final class Bukkit {
public static boolean suggestPlayerNamesWhenNullTabCompletions() {
return server.suggestPlayerNamesWhenNullTabCompletions();
}
@ -312,10 +312,10 @@ index 6a264819bfed8e5cfc8f088e831fb44d761dd223..befd34cfdd37451532f14feeba5e728d
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 72261e9b0bb41471752f7d436c1e3397260c9c23..89fc36a73b8ae26f19b06cb0f9376ec33724b939 100644
index d1e5e679e0a7482a87a9a049ed0ce5c1b9891c90..8021598d78170ea1676cf21bac63858528398f53 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1678,5 +1678,33 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1685,5 +1685,33 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return true if player names should be suggested
*/
boolean suggestPlayerNamesWhenNullTabCompletions();

4
patches/api/0090-Player.setPlayerProfile-API.patch
View file

@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
This can be useful for changing name or skins after a player has logged in.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 96f1f1544d03d2928e95daa0dd02579ef3fdc87c..b2fdf015b8a86ca96eb5c92aa85d7e36ee21aaad 100644
index 8d5ddb1451ea1d7a7a5c9eefb843a4adb885d20e..0dabd6f69e85b21f7ec6e6a2ac46d7fc58af24f6 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -4,6 +4,7 @@ import java.net.InetSocketAddress;
@ -17,7 +17,7 @@ index 96f1f1544d03d2928e95daa0dd02579ef3fdc87c..b2fdf015b8a86ca96eb5c92aa85d7e36
import org.bukkit.DyeColor;
import org.bukkit.Effect;
import org.bukkit.GameMode;
@@ -1907,6 +1908,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1914,6 +1915,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
*/
boolean hasResourcePack();

4
patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Expose attack cooldown methods for Player
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 83bd47744d3e056264e6bf024b45cc86fcd5ea42..65222badf1e06847d59e05366bbfea4b2e039d96 100644
index ac529faeb4e4be2e62228cc931a793f2ff0a28af..1bace560fc0632c702ff820a15defa730272ba75 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2082,6 +2082,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2089,6 +2089,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param profile The new profile to use
*/
void setPlayerProfile(@NotNull PlayerProfile profile);

4
patches/api/0155-Material-API-additions.patch
View file

@ -5,7 +5,7 @@ Subject: [PATCH] Material API additions
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index 41c34903deb148a1100e392030398981880f0419..7bc6a1379d830e05939a9246c31dfc3d2629c9ff 100644
index 2a0773e0981f8470eb897ffd9178bb97e8365050..58c3ab444d484ac781810e26e04b9919eaff3bf2 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -99,6 +99,7 @@ import org.jetbrains.annotations.Nullable;
@ -16,7 +16,7 @@ index 41c34903deb148a1100e392030398981880f0419..7bc6a1379d830e05939a9246c31dfc3d
public enum Material implements Keyed {
//<editor-fold desc="Materials" defaultstate="collapsed">
AIR(9648, 0),
@@ -3975,6 +3976,22 @@ public enum Material implements Keyed {
@@ -3969,6 +3970,22 @@ public enum Material implements Keyed {
}
}

8
patches/api/0164-Make-the-default-permission-message-configurable.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Make the default permission message configurable
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index c85fc0cb1c4927fe637f20a4e2499bce7707d633..48d0921a9d2dccadbd9510543b24afc5ceff88e3 100644
index b0457e7740dda723b6eda481bcea3560d55333f1..a10ad183431d2a67e8f49062fba37e7fc3b760dc 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1924,6 +1924,15 @@ public final class Bukkit {
@@ -1933,6 +1933,15 @@ public final class Bukkit {
return server.suggestPlayerNamesWhenNullTabCompletions();
}
@ -25,10 +25,10 @@ index c85fc0cb1c4927fe637f20a4e2499bce7707d633..48d0921a9d2dccadbd9510543b24afc5
* Creates a PlayerProfile for the specified uuid, with name as null
* @param uuid UUID to create profile for
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 1a80dad1fa0bf3f33f5669f846912092132f8d64..3659a487c1fa3deb9bcfb7de3733ce0c47704f14 100644
index 44a5e05fbc00aa878cd31879677d0aad779eb175..27353a3eb4669ee457fe7d65dc5dd5e8c23c8283 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1691,6 +1691,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1698,6 +1698,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
boolean suggestPlayerNamesWhenNullTabCompletions();

12
patches/api/0178-Fix-Spigot-annotation-mistakes.patch
View file

@ -9,10 +9,10 @@ a ton of noise to plugin developers.
These do not help plugin developers if they bring moise noise than value.
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 48d0921a9d2dccadbd9510543b24afc5ceff88e3..78c820f40c22af18d72ec95e07a73cd96dfdbd2c 100644
index a10ad183431d2a67e8f49062fba37e7fc3b760dc..5c7681809a27796e398170fc72bf0a950e52a971 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1510,7 +1510,7 @@ public final class Bukkit {
@@ -1519,7 +1519,7 @@ public final class Bukkit {
*
* @return the scoreboard manager or null if no worlds are loaded.
*/
@ -21,7 +21,7 @@ index 48d0921a9d2dccadbd9510543b24afc5ceff88e3..78c820f40c22af18d72ec95e07a73cd9
public static ScoreboardManager getScoreboardManager() {
return server.getScoreboardManager();
}
@@ -1807,7 +1807,7 @@ public final class Bukkit {
@@ -1816,7 +1816,7 @@ public final class Bukkit {
* @param clazz the class of the tag entries
* @return the tag or null
*/
@ -62,10 +62,10 @@ index 88b3e0323dbc4f0fce31b147c7aaa08d65745852..23ca89dde7f6ac9082d4b97fce295942
if (this.world == null) {
return null;
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 3659a487c1fa3deb9bcfb7de3733ce0c47704f14..b485befe8374773ad44720cc2adad4bbd1ebf424 100644
index 27353a3eb4669ee457fe7d65dc5dd5e8c23c8283..5162e8b356e73ac41d6f4f5a0ea0efeda85382c7 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1279,7 +1279,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1286,7 +1286,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*
* @return the scoreboard manager or null if no worlds are loaded.
*/
@ -74,7 +74,7 @@ index 3659a487c1fa3deb9bcfb7de3733ce0c47704f14..b485befe8374773ad44720cc2adad4bb
ScoreboardManager getScoreboardManager();
/**
@@ -1549,7 +1549,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1556,7 +1556,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @param clazz the class of the tag entries
* @return the tag or null
*/

8
patches/api/0186-Expose-the-internal-current-tick.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Expose the internal current tick
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 78c820f40c22af18d72ec95e07a73cd96dfdbd2c..4e910d50131b6ccc21466896b5a4adac8a9aa42b 100644
index 5c7681809a27796e398170fc72bf0a950e52a971..caa3d77b5906a2227f6409a877bd0ba14d05caba 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1966,6 +1966,10 @@ public final class Bukkit {
@@ -1975,6 +1975,10 @@ public final class Bukkit {
public static com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name) {
return server.createProfile(uuid, name);
}
@ -20,10 +20,10 @@ index 78c820f40c22af18d72ec95e07a73cd96dfdbd2c..4e910d50131b6ccc21466896b5a4adac
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index b485befe8374773ad44720cc2adad4bbd1ebf424..0de8bd3e9c6b5aca9c65bc9239cf5b223ff0e0a5 100644
index 5162e8b356e73ac41d6f4f5a0ea0efeda85382c7..bf1920857008c272d557f602544009986c3ed284 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1725,5 +1725,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1732,5 +1732,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name);

8
patches/api/0192-Add-tick-times-API.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Add tick times API
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 4e910d50131b6ccc21466896b5a4adac8a9aa42b..61ed19059b491321c3887a20e50371c81dbe6912 100644
index caa3d77b5906a2227f6409a877bd0ba14d05caba..411d06b14a0892531ac578e51d0b166f670adbd6 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1711,6 +1711,25 @@ public final class Bukkit {
@@ -1720,6 +1720,25 @@ public final class Bukkit {
public static double[] getTPS() {
return server.getTPS();
}
@ -35,10 +35,10 @@ index 4e910d50131b6ccc21466896b5a4adac8a9aa42b..61ed19059b491321c3887a20e50371c8
/**
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 0de8bd3e9c6b5aca9c65bc9239cf5b223ff0e0a5..842bdf9b083eda9c64f41f1df99bf4f1c03fb0fa 100644
index bf1920857008c272d557f602544009986c3ed284..1cabf4de832b60abae8c25c0d80d409e8fa727cc 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1453,6 +1453,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1460,6 +1460,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
public double[] getTPS();

8
patches/api/0193-Expose-MinecraftServer-isRunning.patch
View file

@ -6,10 +6,10 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 61ed19059b491321c3887a20e50371c81dbe6912..591719ae6330517885c40a00f3ba9906fa9fa796 100644
index 411d06b14a0892531ac578e51d0b166f670adbd6..796f72b1026371fff09e8ce60536d30609987449 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1989,6 +1989,15 @@ public final class Bukkit {
@@ -1998,6 +1998,15 @@ public final class Bukkit {
public static int getCurrentTick() {
return server.getCurrentTick();
}
@ -26,10 +26,10 @@ index 61ed19059b491321c3887a20e50371c81dbe6912..591719ae6330517885c40a00f3ba9906
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 842bdf9b083eda9c64f41f1df99bf4f1c03fb0fa..5c83da4c929f7f7b8cef19e84929531279f7c4c9 100644
index 1cabf4de832b60abae8c25c0d80d409e8fa727cc..552b56995ffb0898ffd459e0175af57341f39f46 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1747,5 +1747,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1754,5 +1754,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return Current tick
*/
int getCurrentTick();

4
patches/api/0197-Add-Player-Client-Options-API.patch
View file

@ -193,7 +193,7 @@ index 0000000000000000000000000000000000000000..f7f171c4ee0b8339b2f8fbe82442d65f
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 65222badf1e06847d59e05366bbfea4b2e039d96..34c2775e3b0ee42dc51f15ad94a084a9357780b6 100644
index 1bace560fc0632c702ff820a15defa730272ba75..7d4959a96e0cbf9b9e8a980ae4711d02ecd1a430 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2,6 +2,7 @@ package org.bukkit.entity;
@ -204,7 +204,7 @@ index 65222badf1e06847d59e05366bbfea4b2e039d96..34c2775e3b0ee42dc51f15ad94a084a9
import com.destroystokyo.paper.Title; // Paper
import net.kyori.adventure.text.Component;
import com.destroystokyo.paper.profile.PlayerProfile; // Paper
@@ -2102,6 +2103,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2109,6 +2110,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the cooldown counter to 0, effectively starting the cooldown period.
*/
void resetCooldown();

8
patches/api/0202-Add-Mob-Goal-API.patch
View file

@ -520,10 +520,10 @@ index 0000000000000000000000000000000000000000..fb0c77c66ca117eaff9487a41f1e280a
+ @Deprecated GoalKey<Mob> UNIVERSAL_ANGER_RESET = GoalKey.of(Mob.class, NamespacedKey.minecraft("universal_anger_reset"));
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 591719ae6330517885c40a00f3ba9906fa9fa796..747e6b3c4580d3d03714062107822e72495309fd 100644
index 796f72b1026371fff09e8ce60536d30609987449..84dc57bc02d1496afc3fe3df0b94417079c2ee6b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1998,6 +1998,16 @@ public final class Bukkit {
@@ -2007,6 +2007,16 @@ public final class Bukkit {
public static boolean isStopping() {
return server.isStopping();
}
@ -541,10 +541,10 @@ index 591719ae6330517885c40a00f3ba9906fa9fa796..747e6b3c4580d3d03714062107822e72
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 5c83da4c929f7f7b8cef19e84929531279f7c4c9..5799f7adbb791844c2578ac4d9e2e78ed7acd233 100644
index 552b56995ffb0898ffd459e0175af57341f39f46..3633fcb9155e35479005bfa0c13661b1c9fa726a 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1754,5 +1754,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1761,5 +1761,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return true if server is in the process of being shutdown
*/
boolean isStopping();

8
patches/api/0216-Allow-delegation-to-vanilla-chunk-gen.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 954c0d6e8f51e9766f4b742f573ee8d44e589a9e..7559ac61b9f228ef67848c4c65a74b5559163a24 100644
index 474b7a7d14d1b4ef8146c7b23883651ff776e41b..2bcae78ec0016b465b611041b8397fee5a04baaf 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1611,6 +1611,22 @@ public final class Bukkit {
@@ -1620,6 +1620,22 @@ public final class Bukkit {
return server.createChunkData(world);
}
@ -32,10 +32,10 @@ index 954c0d6e8f51e9766f4b742f573ee8d44e589a9e..7559ac61b9f228ef67848c4c65a74b55
* Creates a boss bar instance to display to players. The progress
* defaults to 1.0
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index e37ff8c165e00f4f253f92ee82fa20356bba9d6d..9823fefc72e377c1df1e67f3c588fa837ad55898 100644
index 4800e1e0f127cc159bcc75c856aee9102462b01a..2a2f009a957c19a6d1ef1e284b27fe2f954f13e0 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1364,6 +1364,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1371,6 +1371,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
public ChunkGenerator.ChunkData createChunkData(@NotNull World world);

4
patches/api/0222-Brand-support.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Brand support
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 34c2775e3b0ee42dc51f15ad94a084a9357780b6..3eaf8597a14852a33e42244a7d60bb45a13f7c16 100644
index 7d4959a96e0cbf9b9e8a980ae4711d02ecd1a430..d0d44acb364bafca80e6efa04532b66663ca336a 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2237,6 +2237,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2244,6 +2244,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
// Paper end
}

4
patches/api/0224-Add-methods-to-get-translation-keys.patch
View file

@ -112,7 +112,7 @@ index 442db40bc6ea2cfd2f724807544a080bb62bd8c5..d3365e44e64c2e72416d3a50be20ada7
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index 7bc6a1379d830e05939a9246c31dfc3d2629c9ff..bfae798735067893e4434514b5d729344daca525 100644
index 58c3ab444d484ac781810e26e04b9919eaff3bf2..b637686404f0aa87c6996220987ed4a303496b43 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -100,7 +100,7 @@ import org.jetbrains.annotations.Nullable;
@ -124,7 +124,7 @@ index 7bc6a1379d830e05939a9246c31dfc3d2629c9ff..bfae798735067893e4434514b5d72934
//<editor-fold desc="Materials" defaultstate="collapsed">
AIR(9648, 0),
STONE(22948),
@@ -3990,6 +3990,23 @@ public enum Material implements Keyed {
@@ -3984,6 +3984,23 @@ public enum Material implements Keyed {
}
return false;
}

4
patches/api/0231-Player-elytra-boost-API.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Player elytra boost API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 3eaf8597a14852a33e42244a7d60bb45a13f7c16..183ff01dbf8301f0f3d85156bc341a10360c9e4b 100644
index d0d44acb364bafca80e6efa04532b66663ca336a..e3d56cc4122de5237b89ed670493eecd3413b2b6 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2109,6 +2109,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2116,6 +2116,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
@NotNull
<T> T getClientOption(@NotNull ClientOption<T> option);

8
patches/api/0232-Add-getOfflinePlayerIfCached-String.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 78fee7b1ca0e56fcc81357419c087d85f7689266..8c99c26559a8aa7c79115c3cb68ae2d5e714c4b7 100644
index 1171971a8f9b566ddc6f529845bc8e4ac11a112f..5b95ef65a8cffbb303952c071d0addc7430bd1c4 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1072,6 +1072,27 @@ public final class Bukkit {
@@ -1081,6 +1081,27 @@ public final class Bukkit {
return server.getOfflinePlayer(name);
}
@ -37,10 +37,10 @@ index 78fee7b1ca0e56fcc81357419c087d85f7689266..8c99c26559a8aa7c79115c3cb68ae2d5
* Gets the player by the given UUID, regardless if they are offline or
* online.
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 93673a3cb2b4c4da70d74a26202c1d6c0a5fa8a0..8d65a4773a51a9d9d5bfba9d4f6a8d5cf221e7fd 100644
index 221bc443695289a21aee9f7ac7d8453fea3f774e..95b07b5c13291203cde6653b2de400ff8430011f 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -907,6 +907,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -914,6 +914,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
public OfflinePlayer getOfflinePlayer(@NotNull String name);

4
patches/api/0260-Add-sendOpLevel-API.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Add sendOpLevel API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 183ff01dbf8301f0f3d85156bc341a10360c9e4b..9040050ae896fe9a43899b876f6ea16c236db347 100644
index e3d56cc4122de5237b89ed670493eecd3413b2b6..a6031b6ad451facd8ca6318bd06aa9850feb834c 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2122,6 +2122,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2129,6 +2129,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
@Nullable
Firework boostElytra(@NotNull ItemStack firework);

8
patches/api/0276-Cache-the-result-of-Material-isBlock.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Cache the result of Material#isBlock
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index bfae798735067893e4434514b5d729344daca525..0198ae9a91a3e25c3249dc585d49202e6f4eaee2 100644
index b637686404f0aa87c6996220987ed4a303496b43..5922f4a3d5ac69abb232e8e497d838e10e35316e 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -3934,6 +3934,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
@@ -3928,6 +3928,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
public final Class<?> data;
private final boolean legacy;
private final NamespacedKey key;
@ -16,7 +16,7 @@ index bfae798735067893e4434514b5d729344daca525..0198ae9a91a3e25c3249dc585d49202e
private Material(final int id) {
this(id, 64);
@@ -4138,6 +4139,11 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
@@ -4132,6 +4133,11 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
* @return true if this material is a block
*/
public boolean isBlock() {
@ -28,7 +28,7 @@ index bfae798735067893e4434514b5d729344daca525..0198ae9a91a3e25c3249dc585d49202e
switch (this) {
//<editor-fold defaultstate="collapsed" desc="isBlock">
case ACACIA_BUTTON:
@@ -5219,6 +5225,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
@@ -5213,6 +5219,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
static {
for (Material material : values()) {
BY_NAME.put(material.name(), material);

4
patches/api/0283-Item-Rarity-API.patch
View file

@ -39,10 +39,10 @@ index 0000000000000000000000000000000000000000..74ef8395cc040ce488c2acaa416db202
+ }
+}
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index 0198ae9a91a3e25c3249dc585d49202e6f4eaee2..6bf7a751d863996edb9e64c8c835eb2d66713bb8 100644
index 5922f4a3d5ac69abb232e8e497d838e10e35316e..fd1f64089359bf432a4934932ca6cad46145c04b 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -4008,6 +4008,17 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
@@ -4002,6 +4002,17 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
public @NotNull String translationKey() {
return Bukkit.getUnsafe().getTranslationKey(this);
}

8
patches/api/0301-Add-basic-Datapack-API.patch
View file

@ -70,10 +70,10 @@ index 0000000000000000000000000000000000000000..58f78d5e91beacaf710f62461cf869f7
+
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index f8ff4e39bb9b5c5bcba7cdc25a853d49a51b1125..0fb3c33f4d8ee2c08638a5accdfeea941baafd55 100644
index df684277b9351f9785df051fbe52153c495d8d54..0593d5487f411d34edc3d3b15213db4d86af1407 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2080,6 +2080,14 @@ public final class Bukkit {
@@ -2089,6 +2089,14 @@ public final class Bukkit {
public static com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
return server.getMobGoals();
}
@ -89,10 +89,10 @@ index f8ff4e39bb9b5c5bcba7cdc25a853d49a51b1125..0fb3c33f4d8ee2c08638a5accdfeea94
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 748d6873a000808731b16cdb208752357bf8dfb0..713bfa1a8ac693ce496558616aca5d484634fe1c 100644
index 9f13adfc7fe1c647ce59a102ade4b6469a1071dd..0691ecbf954ae73df396b356f29a896c59ab680a 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1825,5 +1825,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1832,5 +1832,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
com.destroystokyo.paper.entity.ai.MobGoals getMobGoals();

8
patches/api/0305-Add-command-line-option-to-load-extra-plugin-jars-no.patch
View file

@ -7,10 +7,10 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the
ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 0fb3c33f4d8ee2c08638a5accdfeea941baafd55..e7397969fe76f52e3bf8d051bb1f53eaec686eba 100644
index 0593d5487f411d34edc3d3b15213db4d86af1407..9aa6758e206f5105b6004bb415f04e4e9f8cb24b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2062,6 +2062,20 @@ public final class Bukkit {
@@ -2071,6 +2071,20 @@ public final class Bukkit {
return server.getCurrentTick();
}
@ -32,10 +32,10 @@ index 0fb3c33f4d8ee2c08638a5accdfeea941baafd55..e7397969fe76f52e3bf8d051bb1f53ea
* Checks if the server is in the process of being shutdown.
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 713bfa1a8ac693ce496558616aca5d484634fe1c..050cb256b1540c643ef89986c593bad94cf0a9fa 100644
index 0691ecbf954ae73df396b356f29a896c59ab680a..eab6b65bb018b4ec8709c8f61a1d7829b8f5316c 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1811,6 +1811,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1818,6 +1818,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
int getCurrentTick();

4
patches/api/0310-Attributes-API-for-item-defaults.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Attributes API for item defaults
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index 6bf7a751d863996edb9e64c8c835eb2d66713bb8..beec7861310bf056df11a5afccbcb04b994b9e80 100644
index fd1f64089359bf432a4934932ca6cad46145c04b..d849908850025a078ec5127870ec0f61d77a72e9 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -4019,6 +4019,19 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
@@ -4013,6 +4013,19 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
public io.papermc.paper.inventory.ItemRarity getItemRarity() {
return Bukkit.getUnsafe().getItemRarity(this);
}

4
patches/api/0344-Add-isCollidable-methods-to-various-places.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Add isCollidable methods to various places
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index beec7861310bf056df11a5afccbcb04b994b9e80..f3297176f8c0621697deeff8a85e972cd117643f 100644
index d849908850025a078ec5127870ec0f61d77a72e9..f24820f14d689d49dfea25605199d5299ec28e7c 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -4032,6 +4032,16 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
@@ -4026,6 +4026,16 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
public com.google.common.collect.Multimap<org.bukkit.attribute.Attribute, org.bukkit.attribute.AttributeModifier> getItemAttributes(@NotNull EquipmentSlot equipmentSlot) {
return Bukkit.getUnsafe().getItemAttributes(this, equipmentSlot);
}

2
work/Bukkit

@ -1 +1 @@
Subproject commit 0a35cb18fc92be8858f7abc3a23ed19fb4dfa326
Subproject commit 64c8bd39e019135647e27f919b19ea03de2e6d92

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit f38217938a61af5f84d0df76f71a339bd1dc1280
Subproject commit 37e63e63e89052671198b6cdb775d5250a5d18e1

2
work/Spigot

@ -1 +1 @@
Subproject commit 6234669574cf0c5fb951f504399f4b171d1a09a7
Subproject commit 16c0cb416707182fd13db47ff090ea48bd54e494