@@ -135,7 +135,7 @@ index 931d1a0215f54a4ff172b1b6db2ab06c41cd0c39..00000000000000000000000000000000
-
- org.spigotmc
- spigot-api
-- 1.20.4-R0.1-SNAPSHOT
+- 1.20.5-R0.1-SNAPSHOT
- jar
-
- Spigot-API
@@ -144,8 +144,7 @@ index 931d1a0215f54a4ff172b1b6db2ab06c41cd0c39..00000000000000000000000000000000
-
-
- true
-- 17
-- 17
+- 17
- UTF-8
-
-
@@ -266,7 +265,7 @@ index 931d1a0215f54a4ff172b1b6db2ab06c41cd0c39..00000000000000000000000000000000
-
- org.apache.maven.plugins
- maven-compiler-plugin
-- 3.11.0
+- 3.13.0
-
-
- eclipse
@@ -277,7 +276,7 @@ index 931d1a0215f54a4ff172b1b6db2ab06c41cd0c39..00000000000000000000000000000000
-
- org.codehaus.plexus
- plexus-compiler-eclipse
-- 2.13.0
+- 2.15.0
-
-
-
diff --git a/patches/api/0006-Adventure.patch b/patches/api/0006-Adventure.patch
index 28009e5408..e2ce0357bc 100644
--- a/patches/api/0006-Adventure.patch
+++ b/patches/api/0006-Adventure.patch
@@ -778,10 +778,10 @@ index 0000000000000000000000000000000000000000..6e94562d79206d88b74b53814f9423f1
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 2e619279cb06cbe26bb4933a0312b245f8691d0b..bd1a010bb4e18a16d02549d64333ce7641be7910 100644
+index b101827cb752c38d1f38b1c0efa83cca8062f7f7..6425151b7003a1376977717dca6172efa1864648 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -420,7 +420,9 @@ public final class Bukkit {
+@@ -422,7 +422,9 @@ public final class Bukkit {
*
* @param message the message
* @return the number of players
@@ -791,7 +791,7 @@ index 2e619279cb06cbe26bb4933a0312b245f8691d0b..bd1a010bb4e18a16d02549d64333ce76
public static int broadcastMessage(@NotNull String message) {
return server.broadcastMessage(message);
}
-@@ -1211,6 +1213,19 @@ public final class Bukkit {
+@@ -1223,6 +1225,19 @@ public final class Bukkit {
server.shutdown();
}
@@ -811,7 +811,7 @@ index 2e619279cb06cbe26bb4933a0312b245f8691d0b..bd1a010bb4e18a16d02549d64333ce76
/**
* Broadcasts the specified message to every user with the given
* permission name.
-@@ -1220,6 +1235,21 @@ public final class Bukkit {
+@@ -1232,6 +1247,21 @@ public final class Bukkit {
* permissibles} must have to receive the broadcast
* @return number of message recipients
*/
@@ -833,7 +833,7 @@ index 2e619279cb06cbe26bb4933a0312b245f8691d0b..bd1a010bb4e18a16d02549d64333ce76
public static int broadcast(@NotNull String message, @NotNull String permission) {
return server.broadcast(message, permission);
}
-@@ -1481,6 +1511,7 @@ public final class Bukkit {
+@@ -1493,6 +1523,7 @@ public final class Bukkit {
return server.createInventory(owner, type);
}
@@ -841,7 +841,7 @@ index 2e619279cb06cbe26bb4933a0312b245f8691d0b..bd1a010bb4e18a16d02549d64333ce76
/**
* 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;
-@@ -1506,6 +1537,38 @@ public final class Bukkit {
+@@ -1518,6 +1549,38 @@ public final class Bukkit {
* @see InventoryType#isCreatable()
*/
@NotNull
@@ -880,7 +880,7 @@ index 2e619279cb06cbe26bb4933a0312b245f8691d0b..bd1a010bb4e18a16d02549d64333ce76
public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) {
return server.createInventory(owner, type, title);
}
-@@ -1524,6 +1587,7 @@ public final class Bukkit {
+@@ -1536,6 +1599,7 @@ public final class Bukkit {
return server.createInventory(owner, size);
}
@@ -888,7 +888,7 @@ index 2e619279cb06cbe26bb4933a0312b245f8691d0b..bd1a010bb4e18a16d02549d64333ce76
/**
* Creates an empty inventory of type {@link InventoryType#CHEST} with the
* specified size and title.
-@@ -1536,10 +1600,30 @@ public final class Bukkit {
+@@ -1548,10 +1612,30 @@ public final class Bukkit {
* @throws IllegalArgumentException if the size is not a multiple of 9
*/
@NotNull
@@ -919,7 +919,7 @@ index 2e619279cb06cbe26bb4933a0312b245f8691d0b..bd1a010bb4e18a16d02549d64333ce76
/**
* Creates an empty merchant.
*
-@@ -1547,7 +1631,20 @@ public final class Bukkit {
+@@ -1559,7 +1643,20 @@ public final class Bukkit {
* when the merchant inventory is viewed
* @return a new merchant
*/
@@ -940,7 +940,7 @@ index 2e619279cb06cbe26bb4933a0312b245f8691d0b..bd1a010bb4e18a16d02549d64333ce76
public static Merchant createMerchant(@Nullable String title) {
return server.createMerchant(title);
}
-@@ -1664,12 +1761,43 @@ public final class Bukkit {
+@@ -1676,12 +1773,43 @@ public final class Bukkit {
return server.isPrimaryThread();
}
@@ -984,7 +984,7 @@ index 2e619279cb06cbe26bb4933a0312b245f8691d0b..bd1a010bb4e18a16d02549d64333ce76
public static String getMotd() {
return server.getMotd();
}
-@@ -1678,7 +1806,9 @@ public final class Bukkit {
+@@ -1690,7 +1818,9 @@ public final class Bukkit {
* Set the message that is displayed on the server list.
*
* @param motd The message to be displayed
@@ -994,7 +994,7 @@ index 2e619279cb06cbe26bb4933a0312b245f8691d0b..bd1a010bb4e18a16d02549d64333ce76
public static void setMotd(@NotNull String motd) {
server.setMotd(motd);
}
-@@ -1687,8 +1817,10 @@ public final class Bukkit {
+@@ -1699,8 +1829,10 @@ public final class Bukkit {
* Gets the default message that is displayed when the server is stopped.
*
* @return the shutdown message
@@ -1176,10 +1176,10 @@ index ae7b51341fb66c41b8a7c4604fd273d876e311be..4034fcb9abc39b12f0de47c4b679f2ef
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 76b365f98b81234ae1c35014387b0e44f722d5ea..6aed59819cc3d70f1b5975c3c7df40cc0b0afd8a 100644
+index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1b4b7a47b 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -63,13 +63,13 @@ import org.jetbrains.annotations.Nullable;
+@@ -65,13 +65,13 @@ import org.jetbrains.annotations.Nullable;
/**
* Represents a server implementation.
*/
@@ -1195,7 +1195,7 @@ index 76b365f98b81234ae1c35014387b0e44f722d5ea..6aed59819cc3d70f1b5975c3c7df40cc
*/
public static final String BROADCAST_CHANNEL_ADMINISTRATIVE = "bukkit.broadcast.admin";
-@@ -77,7 +77,7 @@ public interface Server extends PluginMessageRecipient {
+@@ -79,7 +79,7 @@ public interface Server extends PluginMessageRecipient {
* Used for all announcement messages, such as informing users that a
* player has joined.
*
@@ -1204,7 +1204,7 @@ index 76b365f98b81234ae1c35014387b0e44f722d5ea..6aed59819cc3d70f1b5975c3c7df40cc
*/
public static final String BROADCAST_CHANNEL_USERS = "bukkit.broadcast.user";
-@@ -353,7 +353,9 @@ public interface Server extends PluginMessageRecipient {
+@@ -355,7 +355,9 @@ public interface Server extends PluginMessageRecipient {
*
* @param message the message
* @return the number of players
@@ -1214,7 +1214,7 @@ index 76b365f98b81234ae1c35014387b0e44f722d5ea..6aed59819cc3d70f1b5975c3c7df40cc
public int broadcastMessage(@NotNull String message);
/**
-@@ -1039,8 +1041,33 @@ public interface Server extends PluginMessageRecipient {
+@@ -1049,8 +1051,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
@@ -1248,7 +1248,7 @@ index 76b365f98b81234ae1c35014387b0e44f722d5ea..6aed59819cc3d70f1b5975c3c7df40cc
/**
* Gets the player by the given name, regardless if they are offline or
-@@ -1257,6 +1284,35 @@ public interface Server extends PluginMessageRecipient {
+@@ -1267,6 +1294,35 @@ public interface Server extends PluginMessageRecipient {
@NotNull
Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type);
@@ -1284,7 +1284,7 @@ index 76b365f98b81234ae1c35014387b0e44f722d5ea..6aed59819cc3d70f1b5975c3c7df40cc
/**
* 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;
-@@ -1278,9 +1334,11 @@ public interface Server extends PluginMessageRecipient {
+@@ -1288,9 +1344,11 @@ public interface Server extends PluginMessageRecipient {
* @return The new inventory.
* @throws IllegalArgumentException if the {@link InventoryType} cannot be
* viewed.
@@ -1296,7 +1296,7 @@ index 76b365f98b81234ae1c35014387b0e44f722d5ea..6aed59819cc3d70f1b5975c3c7df40cc
@NotNull
Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title);
-@@ -1296,6 +1354,22 @@ public interface Server extends PluginMessageRecipient {
+@@ -1306,6 +1364,22 @@ public interface Server extends PluginMessageRecipient {
@NotNull
Inventory createInventory(@Nullable InventoryHolder owner, int size) throws IllegalArgumentException;
@@ -1319,7 +1319,7 @@ index 76b365f98b81234ae1c35014387b0e44f722d5ea..6aed59819cc3d70f1b5975c3c7df40cc
/**
* Creates an empty inventory of type {@link InventoryType#CHEST} with the
* specified size and title.
-@@ -1306,18 +1380,32 @@ public interface Server extends PluginMessageRecipient {
+@@ -1316,18 +1390,32 @@ public interface Server extends PluginMessageRecipient {
* viewed
* @return a new inventory
* @throws IllegalArgumentException if the size is not a multiple of 9
@@ -1352,7 +1352,7 @@ index 76b365f98b81234ae1c35014387b0e44f722d5ea..6aed59819cc3d70f1b5975c3c7df40cc
Merchant createMerchant(@Nullable String title);
/**
-@@ -1413,27 +1501,56 @@ public interface Server extends PluginMessageRecipient {
+@@ -1423,27 +1511,56 @@ public interface Server extends PluginMessageRecipient {
*/
boolean isPrimaryThread();
@@ -1409,7 +1409,7 @@ index 76b365f98b81234ae1c35014387b0e44f722d5ea..6aed59819cc3d70f1b5975c3c7df40cc
String getShutdownMessage();
/**
-@@ -1815,7 +1932,9 @@ public interface Server extends PluginMessageRecipient {
+@@ -1834,7 +1951,9 @@ public interface Server extends PluginMessageRecipient {
* Sends the component to the player
*
* @param component the components to send
@@ -1419,7 +1419,7 @@ index 76b365f98b81234ae1c35014387b0e44f722d5ea..6aed59819cc3d70f1b5975c3c7df40cc
public void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
throw new UnsupportedOperationException("Not supported yet.");
}
-@@ -1824,7 +1943,9 @@ public interface Server extends PluginMessageRecipient {
+@@ -1843,7 +1962,9 @@ public interface Server extends PluginMessageRecipient {
* Sends an array of components as a single message to the player
*
* @param components the components to send
@@ -1430,7 +1430,7 @@ index 76b365f98b81234ae1c35014387b0e44f722d5ea..6aed59819cc3d70f1b5975c3c7df40cc
throw new UnsupportedOperationException("Not supported yet.");
}
diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
-index 9b1247cdf8a2fed812c46c55193d574aafc3bc94..72ea6ddd00eed73459d700d657929f83ba1ca7ee 100644
+index bd3861c4c2eabca93065c0a6e24e0d3603d86db2..ddc4c5097214371108dc945371e1d28811352c38 100644
--- a/src/main/java/org/bukkit/Sound.java
+++ b/src/main/java/org/bukkit/Sound.java
@@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
@@ -1442,7 +1442,7 @@ index 9b1247cdf8a2fed812c46c55193d574aafc3bc94..72ea6ddd00eed73459d700d657929f83
AMBIENT_BASALT_DELTAS_ADDITIONS("ambient.basalt_deltas.additions"),
AMBIENT_BASALT_DELTAS_LOOP("ambient.basalt_deltas.loop"),
-@@ -1614,4 +1614,11 @@ public enum Sound implements Keyed {
+@@ -1727,4 +1727,11 @@ public enum Sound implements Keyed {
public NamespacedKey getKey() {
return key;
}
@@ -1523,7 +1523,7 @@ index efb97712cc9dc7c1e12a59f5b94e4f2ad7c6b7d8..3024468af4c073324e536c1cb26beffb
return warning == null || warning.value();
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 28193b8e3c79e14af2ce47857a717f9dd4f1fa42..b53f24c0368ff4e4f5287f1699643a0c00579031 100644
+index 3132e6754ab462eca0b7de1e7ad64c955316296d..a9858c2559f0921613b19710135cc6e060488e96 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -47,7 +47,7 @@ import org.jetbrains.annotations.Nullable;
@@ -1743,7 +1743,7 @@ index 0f4ae7bd2ad379b5edb40f49f93de9e18c38f415..575e545a69b5279b90067d7ebee08b7b
/**
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 80209bb88a0294d4eedc78509533a6257315d856..75759131bd94b672bec4cd8e271ebff1ad391cba 100644
+index ac89f041dc983485174a174e79cd21159fdfba1e..f3cdf13f22aa789ee8cc235b61fda4035b254219 100644
--- a/src/main/java/org/bukkit/command/Command.java
+++ b/src/main/java/org/bukkit/command/Command.java
@@ -32,7 +32,7 @@ public abstract class Command {
@@ -1770,35 +1770,25 @@ index 80209bb88a0294d4eedc78509533a6257315d856..75759131bd94b672bec4cd8e271ebff1
}
return false;
-@@ -317,10 +317,12 @@ public abstract class Command {
- * command
- *
- * @return Permission check failed message
-+ * @deprecated use {@link #permissionMessage()}
- */
+@@ -327,7 +327,7 @@ public abstract class Command {
+ @Deprecated
@Nullable
-+ @Deprecated // Paper
public String getPermissionMessage() {
- return permissionMessage;
+ return net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serializeOrNull(permissionMessage); // Paper
}
/**
-@@ -381,10 +383,12 @@ public abstract class Command {
- * @param permissionMessage new permission message, null to indicate
- * default message, or an empty string to indicate no message
- * @return this command object, for chaining
-+ * @deprecated use {@link #permissionMessage(net.kyori.adventure.text.Component)}
- */
+@@ -398,7 +398,7 @@ public abstract class Command {
+ @Deprecated
@NotNull
-+ @Deprecated // Paper
public Command setPermissionMessage(@Nullable String permissionMessage) {
- this.permissionMessage = permissionMessage;
+ this.permissionMessage = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserializeOrNull(permissionMessage); // Paper
return this;
}
-@@ -399,13 +403,47 @@ public abstract class Command {
+@@ -413,13 +413,61 @@ public abstract class Command {
this.usageMessage = (usage == null) ? "" : usage;
return this;
}
@@ -1807,7 +1797,14 @@ index 80209bb88a0294d4eedc78509533a6257315d856..75759131bd94b672bec4cd8e271ebff1
+ * Gets the permission message.
+ *
+ * @return the permission message
++ * @deprecated permission messages have not worked for player-executed
++ * commands since 1.13 as clients without permission to execute a command
++ * are unaware of its existence and therefore will not send an unknown
++ * command execution to the server. This message will only ever be shown to
++ * consoles or when this command is executed with
++ * {@link Bukkit#dispatchCommand(CommandSender, String)}.
+ */
++ @Deprecated
+ public net.kyori.adventure.text.@Nullable Component permissionMessage() {
+ return this.permissionMessage;
+ }
@@ -1816,7 +1813,14 @@ index 80209bb88a0294d4eedc78509533a6257315d856..75759131bd94b672bec4cd8e271ebff1
+ * Sets the permission message.
+ *
+ * @param permissionMessage the permission message
++ * @deprecated permission messages have not worked for player-executed
++ * commands since 1.13 as clients without permission to execute a command
++ * are unaware of its existence and therefore will not send an unknown
++ * command execution to the server. This message will only ever be shown to
++ * consoles or when this command is executed with
++ * {@link Bukkit#dispatchCommand(CommandSender, String)}.
+ */
++ @Deprecated
+ public void permissionMessage(net.kyori.adventure.text.@Nullable Component permissionMessage) {
+ this.permissionMessage = permissionMessage;
+ }
@@ -1847,7 +1851,7 @@ index 80209bb88a0294d4eedc78509533a6257315d856..75759131bd94b672bec4cd8e271ebff1
if (source instanceof BlockCommandSender) {
BlockCommandSender blockCommandSender = (BlockCommandSender) source;
-@@ -424,7 +462,12 @@ public abstract class Command {
+@@ -438,7 +486,12 @@ public abstract class Command {
}
Set users = Bukkit.getPluginManager().getPermissionSubscriptions(Server.BROADCAST_CHANNEL_ADMINISTRATIVE);
@@ -2178,10 +2182,10 @@ index b7d8dd30360a38dbdc7bbce40c8e6ced7261f833..0817f2395c2b18828565435568ce651f
public void sendRawMessage(@Nullable UUID sender, @NotNull String message);
}
diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java
-index a456e43308b95f51beed2159e6baf00f32702a71..350d52f4dd97a7e6a6a9a967e1c6a8781feda22e 100644
+index f9965740ffa267caa698f854120a5d89727c6d37..dddd0e74962d5713c4bb6219fba48aae5763e9ea 100644
--- a/src/main/java/org/bukkit/enchantments/Enchantment.java
+++ b/src/main/java/org/bukkit/enchantments/Enchantment.java
-@@ -296,6 +296,19 @@ public abstract class Enchantment implements Keyed, Translatable {
+@@ -317,6 +317,19 @@ public abstract class Enchantment implements Keyed, Translatable {
* @return True if the enchantment may be applied, otherwise False
*/
public abstract boolean canEnchantItem(@NotNull ItemStack item);
@@ -2218,7 +2222,7 @@ index 7ad7bcf9a9333c8d6d1d7cab53a6d457ec20bbf6..c4f86ba1037f3f0e5d697a0962d71d6f
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 53450c104a25151094961a58ffa0d809e3b9a064..474765f40801a766c853018ea6e1adcd010375d2 100644
+index 558fe6e23f562ee873fc84112f930c6ea19a09f4..c78fb359bd28b8dc1ba242642ec612e856525993 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.Nullable;
@@ -2230,7 +2234,7 @@ index 53450c104a25151094961a58ffa0d809e3b9a064..474765f40801a766c853018ea6e1adcd
/**
* Gets the entity's current position
-@@ -765,4 +765,20 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -776,4 +776,20 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@Override
Spigot spigot();
// Spigot end
@@ -2252,10 +2256,10 @@ index 53450c104a25151094961a58ffa0d809e3b9a064..474765f40801a766c853018ea6e1adcd
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a8904c998ea 100644
+index 712c0a8ae919ed9e7cb84cebd4b6a415ddaa63eb..4e9ba039669c7059180f5776ee2f7188f2dd01b5 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -54,7 +54,41 @@ import org.jetbrains.annotations.Nullable;
+@@ -56,7 +56,41 @@ import org.jetbrains.annotations.Nullable;
/**
* Represents a player, connected or not
*/
@@ -2298,7 +2302,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
/**
* {@inheritDoc}
-@@ -71,7 +105,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -73,7 +107,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* places defined by plugins.
*
* @return the friendly name
@@ -2308,7 +2312,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
@NotNull
public String getDisplayName();
-@@ -83,15 +119,50 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -85,15 +121,50 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* places defined by plugins.
*
* @param name The new display name.
@@ -2359,7 +2363,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
public String getPlayerListName();
/**
-@@ -100,14 +171,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -102,14 +173,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* If the value is null, the name will be identical to {@link #getName()}.
*
* @param name new player list name
@@ -2378,7 +2382,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
@Nullable
public String getPlayerListHeader();
-@@ -115,7 +190,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -117,7 +192,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Gets the currently displayed player list footer for this player.
*
* @return player list header or null
@@ -2388,7 +2392,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
@Nullable
public String getPlayerListFooter();
-@@ -123,14 +200,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -125,14 +202,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Sets the currently displayed player list header for this player.
*
* @param header player list header, null for empty
@@ -2407,7 +2411,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
public void setPlayerListFooter(@Nullable String footer);
/**
-@@ -139,7 +220,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -141,7 +222,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* @param header player list header, null for empty
* @param footer player list footer, null for empty
@@ -2417,7 +2421,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
public void setPlayerListHeaderFooter(@Nullable String header, @Nullable String footer);
/**
-@@ -177,9 +260,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -221,9 +304,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Kicks player with custom kick message.
*
* @param message kick message
@@ -2443,7 +2447,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
/**
* Adds this user to the {@link ProfileBanList}. If a previous ban exists, this will
* update the entry.
-@@ -842,6 +941,106 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -886,6 +985,106 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void sendEquipmentChange(@NotNull LivingEntity entity, @NotNull Map items);
@@ -2550,7 +2554,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
/**
* Send a sign change. This fakes a sign change packet for a user at
* a certain location. This will not actually change the world in any way.
-@@ -859,7 +1058,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -903,7 +1102,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param lines the new text on the sign or null to clear it
* @throws IllegalArgumentException if location is null
* @throws IllegalArgumentException if lines is non-null and has a length less than 4
@@ -2562,7 +2566,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines) throws IllegalArgumentException;
/**
-@@ -881,7 +1084,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -925,7 +1128,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @throws IllegalArgumentException if location is null
* @throws IllegalArgumentException if dyeColor is null
* @throws IllegalArgumentException if lines is non-null and has a length less than 4
@@ -2574,7 +2578,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException;
/**
-@@ -904,7 +1111,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -948,7 +1155,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @throws IllegalArgumentException if location is null
* @throws IllegalArgumentException if dyeColor is null
* @throws IllegalArgumentException if lines is non-null and has a length less than 4
@@ -2586,7 +2590,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor, boolean hasGlowingText) throws IllegalArgumentException;
/**
-@@ -1372,7 +1583,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1416,7 +1627,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @throws IllegalArgumentException Thrown if the URL is null.
* @throws IllegalArgumentException Thrown if the URL is too long.
* @deprecated Minecraft no longer uses textures packs. Instead you
@@ -2595,7 +2599,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
*/
@Deprecated
public void setTexturePack(@NotNull String url);
-@@ -1408,7 +1619,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1452,7 +1663,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @throws IllegalArgumentException Thrown if the URL is null.
* @throws IllegalArgumentException Thrown if the URL is too long. The
* length restriction is an implementation specific arbitrary value.
@@ -2605,7 +2609,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
public void setResourcePack(@NotNull String url);
/**
-@@ -1440,6 +1653,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1484,6 +1697,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* pack correctly.
*
*
@@ -2613,7 +2617,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
* @param url The URL from which the client will download the resource
* pack. The string must contain only US-ASCII characters and should
* be encoded as per RFC 1738.
-@@ -1452,6 +1666,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1496,6 +1710,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @throws IllegalArgumentException Thrown if the hash is not 20 bytes
* long.
*/
@@ -2621,7 +2625,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
public void setResourcePack(@NotNull String url, @Nullable byte[] hash);
/**
-@@ -1476,12 +1691,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1520,12 +1735,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* {@link PlayerResourcePackStatusEvent} to figure out whether or not
* the player loaded the pack!
* To remove a resource pack you can use
@@ -2636,7 +2640,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
* @param url The URL from which the client will download the resource
* pack. The string must contain only US-ASCII characters and should
* be encoded as per RFC 1738.
-@@ -1495,8 +1711,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1539,8 +1755,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @throws IllegalArgumentException Thrown if the hash is not 20 bytes
* long.
*/
@@ -2647,7 +2651,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
/**
* Request that the player's client download and switch resource packs.
*
-@@ -1519,7 +1737,54 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1563,7 +1781,54 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* {@link PlayerResourcePackStatusEvent} to figure out whether or not
* the player loaded the pack!
*
To remove a resource pack you can use
@@ -2703,7 +2707,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
* The request is sent with empty string as the hash when the hash is
* not provided. This might result in newer versions not loading the
* pack correctly.
-@@ -1538,7 +1803,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1582,7 +1847,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* length restriction is an implementation specific arbitrary value.
* @throws IllegalArgumentException Thrown if the hash is not 20 bytes
* long.
@@ -2713,7 +2717,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
public void setResourcePack(@NotNull String url, @Nullable byte[] hash, boolean force);
/**
-@@ -1563,7 +1830,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1607,7 +1874,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* {@link PlayerResourcePackStatusEvent} to figure out whether or not
* the player loaded the pack!
* To remove a resource pack you can use
@@ -2722,7 +2726,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
* The request is sent with empty string as the hash when the hash is
* not provided. This might result in newer versions not loading the
* pack correctly.
-@@ -1583,9 +1850,61 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1627,9 +1894,61 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* length restriction is an implementation specific arbitrary value.
* @throws IllegalArgumentException Thrown if the hash is not 20 bytes
* long.
@@ -2784,7 +2788,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
/**
* Request that the player's client download and switch resource packs.
*
-@@ -1608,7 +1927,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1652,7 +1971,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* {@link PlayerResourcePackStatusEvent} to figure out whether or not
* the player loaded the pack!
*
To remove a resource pack you can use
@@ -2793,7 +2797,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
* The request is sent with empty string as the hash when the hash is
* not provided. This might result in newer versions not loading the
* pack correctly.
-@@ -1629,9 +1948,60 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1673,9 +1992,60 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* length restriction is an implementation specific arbitrary value.
* @throws IllegalArgumentException Thrown if the hash is not 20 bytes
* long.
@@ -2854,7 +2858,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
/**
* Request that the player's client download and include another resource pack.
*
-@@ -1684,12 +2054,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1728,12 +2098,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* @param id the id of the resource pack.
* @throws IllegalArgumentException If the ID is null.
@@ -2869,7 +2873,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
*/
public void removeResourcePacks();
-@@ -1827,7 +2199,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1871,7 +2243,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* @param title Title text
* @param subtitle Subtitle text
@@ -2878,7 +2882,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
*/
@Deprecated
public void sendTitle(@Nullable String title, @Nullable String subtitle);
-@@ -1846,7 +2218,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1890,7 +2262,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param fadeIn time in ticks for titles to fade in. Defaults to 10.
* @param stay time in ticks for titles to stay. Defaults to 70.
* @param fadeOut time in ticks for titles to fade out. Defaults to 20.
@@ -2888,7 +2892,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
public void sendTitle(@Nullable String title, @Nullable String subtitle, int fadeIn, int stay, int fadeOut);
/**
-@@ -2073,6 +2447,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2117,6 +2491,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public int getClientViewDistance();
@@ -2903,7 +2907,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
/**
* Gets the player's estimated ping in milliseconds.
*
-@@ -2098,8 +2480,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2142,8 +2524,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* they wish.
*
* @return the player's locale
@@ -2914,7 +2918,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
public String getLocale();
/**
-@@ -2151,6 +2535,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2195,6 +2579,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public boolean isAllowingServerListings();
@@ -2929,7 +2933,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
// Spigot start
public class Spigot extends Entity.Spigot {
-@@ -2182,11 +2574,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2226,11 +2618,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -2943,7 +2947,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
@Override
public void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");
-@@ -2197,7 +2591,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2241,7 +2635,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* @param position the screen position
* @param component the components to send
@@ -2953,7 +2957,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
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.");
}
-@@ -2207,7 +2603,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2251,7 +2647,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* @param position the screen position
* @param components the components to send
@@ -2963,7 +2967,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
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.");
}
-@@ -2218,7 +2616,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2262,7 +2660,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
@@ -2973,7 +2977,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable java.util.UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent component) {
throw new UnsupportedOperationException("Not supported yet.");
}
-@@ -2229,7 +2629,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2273,7 +2673,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
@@ -2984,7 +2988,7 @@ index 764390e5b258ab3cadedb14be00d0c0d601b8a1f..5c55715c8cdd79f2214b265a81d94a89
throw new UnsupportedOperationException("Not supported yet.");
}
diff --git a/src/main/java/org/bukkit/entity/TextDisplay.java b/src/main/java/org/bukkit/entity/TextDisplay.java
-index d6d7ada3d3ff9a033ce3f780b104ef3e176f9083..f101ffde9e7b3f6c3ab6f1cffb8d6f4e720634b2 100644
+index bbce00a6d84aaad4a0ec892ec5cb1b995a0a5a05..a8277270e81bc3d9bbc64c029fe11e3d11e1d9ac 100644
--- a/src/main/java/org/bukkit/entity/TextDisplay.java
+++ b/src/main/java/org/bukkit/entity/TextDisplay.java
@@ -13,17 +13,37 @@ public interface TextDisplay extends Display {
@@ -3330,7 +3334,7 @@ index 9c68c3f2d61500479f48b80264f625aaae2f3204..399afcd19fcb6acd24857ed6ab48cf0d
private static final HandlerList handlers = new HandlerList();
private boolean cancel = false;
diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-index 9866c07c999f46cb585709804aaad710c3031d5a..3432872303aa0df97b5d9090fe98b269ef3cb9f4 100644
+index 7ca90f318a013786931043c9a10a93cf6aede199..004f1fd55c143e6c21be74d0a6b9ee8b2e12cc59 100644
--- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
+++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
@@ -10,11 +10,18 @@ import org.jetbrains.annotations.NotNull;
@@ -3353,8 +3357,8 @@ index 9866c07c999f46cb585709804aaad710c3031d5a..3432872303aa0df97b5d9090fe98b269
private final String name;
private final InetAddress ipAddress;
private final UUID uniqueId;
-@@ -27,7 +34,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
- public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId) {
+@@ -33,7 +40,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
+ public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, boolean transferred) {
super(true);
this.result = Result.ALLOWED;
- this.message = "";
@@ -3362,7 +3366,7 @@ index 9866c07c999f46cb585709804aaad710c3031d5a..3432872303aa0df97b5d9090fe98b269
this.name = name;
this.ipAddress = ipAddress;
this.uniqueId = uniqueId;
-@@ -79,6 +86,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
+@@ -86,6 +93,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
this.result = result == null ? null : Result.valueOf(result.name());
}
@@ -3370,7 +3374,7 @@ index 9866c07c999f46cb585709804aaad710c3031d5a..3432872303aa0df97b5d9090fe98b269
/**
* Gets the current kick message that will be used if getResult() !=
* Result.ALLOWED
-@@ -86,7 +94,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
+@@ -93,7 +101,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
* @return Current kick message
*/
@NotNull
@@ -3379,7 +3383,7 @@ index 9866c07c999f46cb585709804aaad710c3031d5a..3432872303aa0df97b5d9090fe98b269
return message;
}
-@@ -95,16 +103,66 @@ public class AsyncPlayerPreLoginEvent extends Event {
+@@ -102,16 +110,66 @@ public class AsyncPlayerPreLoginEvent extends Event {
*
* @param message New kick message
*/
@@ -3448,7 +3452,7 @@ index 9866c07c999f46cb585709804aaad710c3031d5a..3432872303aa0df97b5d9090fe98b269
}
/**
-@@ -112,10 +170,12 @@ public class AsyncPlayerPreLoginEvent extends Event {
+@@ -119,10 +177,12 @@ public class AsyncPlayerPreLoginEvent extends Event {
*
* @param result New result for disallowing the player
* @param message Kick message to display to the user
@@ -3462,7 +3466,7 @@ index 9866c07c999f46cb585709804aaad710c3031d5a..3432872303aa0df97b5d9090fe98b269
}
/**
-@@ -130,7 +190,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
+@@ -137,7 +197,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
@Deprecated
public void disallow(@NotNull final PlayerPreLoginEvent.Result result, @NotNull final String message) {
this.result = result == null ? null : Result.valueOf(result.name());
@@ -4354,19 +4358,179 @@ index 88cdce67e6a55712cb56e946f2f09c82ddbc1d15..e76c847e57f3d32757129d56922862a4
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/inventory/meta/BookMeta.java b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
-index fc94719f702f23da8de5340d7f9e9b9d0c9d7c66..151ccc0fe93a7d216677b20e904f006905d6a988 100644
+index 9bab73c3c2ca759b8e1c7d07d98cc593c961666a..7cc66e5dd6f19295728d3c0e6c0898338281b8a7 100644
--- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
-@@ -10,7 +10,7 @@ import org.jetbrains.annotations.Nullable;
- * Represents a book ({@link Material#WRITABLE_BOOK} or {@link
- * Material#WRITTEN_BOOK}) that can have a title, an author, and pages.
- */
--public interface BookMeta extends ItemMeta {
-+public interface BookMeta extends ItemMeta, net.kyori.adventure.inventory.Book { // Paper
+@@ -124,8 +124,10 @@ public interface BookMeta extends WritableBookMeta {
+ *
+ * @param page the page number to get
+ * @return the page from the book
++ * @deprecated in favour of {@link #page(int)}
+ */
+ @NotNull
++ @Deprecated // Paper
+ public BaseComponent[] getPage(int page) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+@@ -139,7 +141,9 @@ public interface BookMeta extends WritableBookMeta {
+ *
+ * @param page the page number to set
+ * @param data the data to set for that page
++ * @deprecated in favour of {@link #page(int, net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ public void setPage(int page, @Nullable BaseComponent... data) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+@@ -148,8 +152,10 @@ public interface BookMeta extends WritableBookMeta {
+ * Gets all the pages in the book.
+ *
+ * @return list of all the pages in the book
++ * @deprecated in favour of {@link #pages()}
+ */
+ @NotNull
++ @Deprecated // Paper
+ public List getPages() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+@@ -159,7 +165,9 @@ public interface BookMeta extends WritableBookMeta {
+ * pages. Maximum 50 pages with 256 characters per page.
+ *
+ * @param pages A list of pages to set the book to use
++ * @deprecated in favour of {@link #pages(java.util.List)}
+ */
++ @Deprecated // Paper
+ public void setPages(@NotNull List pages) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+@@ -169,7 +177,9 @@ public interface BookMeta extends WritableBookMeta {
+ * pages. Maximum 50 pages with 256 characters per page.
+ *
+ * @param pages A list of component arrays, each being a page
++ * @deprecated in favour of {@link #pages(net.kyori.adventure.text.Component...)}
+ */
++ @Deprecated // Paper
+ public void setPages(@NotNull BaseComponent[]... pages) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+@@ -179,7 +189,9 @@ public interface BookMeta extends WritableBookMeta {
+ * with 256 characters per page.
+ *
+ * @param pages A list of component arrays, each being a page
++ * @deprecated in favour of {@link #addPages(net.kyori.adventure.text.Component...)}
+ */
++ @Deprecated // Paper
+ public void addPage(@NotNull BaseComponent[]... pages) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
+index 255f79d5bca15620cb17d7b54ffebb6ff00bff6b..d7c178b3584db5866a5a21c6ddaab876b94058b9 100644
+--- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
++++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
+@@ -34,6 +34,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+ */
+ boolean hasDisplayName();
+
++ // Paper start
++ /**
++ * Gets the display name.
++ *
++ * Plugins should check that {@link #hasDisplayName()} returns true before calling this method.
++ *
++ * @return the display name
++ */
++ net.kyori.adventure.text.@Nullable Component displayName();
++
++ /**
++ * Sets the display name.
++ *
++ * @param displayName the display name to set
++ */
++ void displayName(final net.kyori.adventure.text.@Nullable Component displayName);
++ // Paper end
++
+ /**
+ * Gets the display name that is set.
+ *
+@@ -41,7 +59,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+ * before calling this method.
+ *
+ * @return the display name that is set
++ * @deprecated in favour of {@link #displayName()}
+ */
++ @Deprecated // Paper
+ @NotNull
+ String getDisplayName();
+
+@@ -49,7 +69,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+ * Sets the display name.
+ *
+ * @param name the name to set
++ * @deprecated in favour of {@link #displayName(net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ void setDisplayName(@Nullable String name);
/**
- * Represents the generation (or level of copying) of a written book
-@@ -119,6 +119,109 @@ public interface BookMeta extends ItemMeta {
+@@ -124,6 +146,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+ */
+ boolean hasLore();
+
++ // Paper start
++ /**
++ * Gets the lore.
++ *
++ *
Plugins should check that {@link #hasLore()} returns true before calling this method.
++ *
++ * @return the lore
++ */
++ @Nullable List lore();
++
++ /**
++ * Sets the lore.
++ *
++ * @param lore the lore to set
++ */
++ void lore(final @Nullable List lore);
++ // Paper end
++
+ /**
+ * Gets the lore that is set.
+ *
+@@ -131,7 +171,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+ * calling this method.
+ *
+ * @return a list of lore that is set
++ * @deprecated in favour of {@link #lore()}
+ */
++ @Deprecated // Paper
+ @Nullable
+ List getLore();
+
+@@ -140,7 +182,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+ * Removes lore when given null.
+ *
+ * @param lore the lore that will be set
++ * @deprecated in favour of {@link #lore(List)}
+ */
++ @Deprecated // Paper
+ void setLore(@Nullable List lore);
+
+ /**
+diff --git a/src/main/java/org/bukkit/inventory/meta/WritableBookMeta.java b/src/main/java/org/bukkit/inventory/meta/WritableBookMeta.java
+index 12595536080ffe09df2b6ecdb83d846f50100d38..dec77fc3aff1baf21aeff8d8d681a46f597935c9 100644
+--- a/src/main/java/org/bukkit/inventory/meta/WritableBookMeta.java
++++ b/src/main/java/org/bukkit/inventory/meta/WritableBookMeta.java
+@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
+ * Represents a book ({@link Material#WRITABLE_BOOK} or {@link
+ * Material#WRITTEN_BOOK}) that can have pages.
+ */
+-public interface WritableBookMeta extends ItemMeta {
++public interface WritableBookMeta extends ItemMeta, net.kyori.adventure.inventory.Book { // Paper
+
+ /**
+ * Checks for the existence of pages in the book.
+@@ -17,6 +17,108 @@ public interface WritableBookMeta extends ItemMeta {
*/
boolean hasPages();
@@ -4380,7 +4544,7 @@ index fc94719f702f23da8de5340d7f9e9b9d0c9d7c66..151ccc0fe93a7d216677b20e904f0069
+ * @return the title of the book
+ */
+ @Override
-+ net.kyori.adventure.text.@Nullable Component title();
++ net.kyori.adventure.text.@org.jetbrains.annotations.Nullable Component title();
+
+ /**
+ * Sets the title of the book.
@@ -4392,7 +4556,7 @@ index fc94719f702f23da8de5340d7f9e9b9d0c9d7c66..151ccc0fe93a7d216677b20e904f0069
+ */
+ @org.jetbrains.annotations.Contract(value = "_ -> this", pure = false)
+ @Override
-+ @NotNull BookMeta title(net.kyori.adventure.text.@Nullable Component title);
++ @NotNull BookMeta title(net.kyori.adventure.text.@org.jetbrains.annotations.Nullable Component title);
+
+ /**
+ * Gets the author of the book.
@@ -4403,7 +4567,7 @@ index fc94719f702f23da8de5340d7f9e9b9d0c9d7c66..151ccc0fe93a7d216677b20e904f0069
+ * @return the author of the book
+ */
+ @Override
-+ net.kyori.adventure.text.@Nullable Component author();
++ net.kyori.adventure.text.@org.jetbrains.annotations.Nullable Component author();
+
+ /**
+ * Sets the author of the book. Removes author when given null.
@@ -4413,7 +4577,7 @@ index fc94719f702f23da8de5340d7f9e9b9d0c9d7c66..151ccc0fe93a7d216677b20e904f0069
+ */
+ @org.jetbrains.annotations.Contract(value = "_ -> this", pure = false)
+ @Override
-+ @NotNull BookMeta author(net.kyori.adventure.text.@Nullable Component author);
++ @NotNull BookMeta author(net.kyori.adventure.text.@org.jetbrains.annotations.Nullable Component author);
+
+ /**
+ * Gets the specified page in the book. The page must exist.
@@ -4447,13 +4611,13 @@ index fc94719f702f23da8de5340d7f9e9b9d0c9d7c66..151ccc0fe93a7d216677b20e904f0069
+ */
+ void addPages(net.kyori.adventure.text.@NotNull Component @NotNull ... pages);
+
-+ interface BookMetaBuilder extends Builder {
++ interface BookMetaBuilder extends net.kyori.adventure.inventory.Book.Builder {
+
+ @Override
-+ @NotNull BookMetaBuilder title(net.kyori.adventure.text.@Nullable Component title);
++ @NotNull BookMetaBuilder title(net.kyori.adventure.text.@org.jetbrains.annotations.Nullable Component title);
+
+ @Override
-+ @NotNull BookMetaBuilder author(net.kyori.adventure.text.@Nullable Component author);
++ @NotNull BookMetaBuilder author(net.kyori.adventure.text.@org.jetbrains.annotations.Nullable Component author);
+
+ @Override
+ @NotNull BookMetaBuilder addPage(net.kyori.adventure.text.@NotNull Component page);
@@ -4470,13 +4634,12 @@ index fc94719f702f23da8de5340d7f9e9b9d0c9d7c66..151ccc0fe93a7d216677b20e904f0069
+
+ @Override
+ @NotNull BookMetaBuilder toBuilder();
-+
+ // Paper end
+
/**
* Gets the specified page in the book. The given page must exist.
*
-@@ -126,8 +229,10 @@ public interface BookMeta extends ItemMeta {
+@@ -24,8 +126,10 @@ public interface WritableBookMeta extends ItemMeta {
*
* @param page the page number to get, in range [1, getPageCount()]
* @return the page from the book
@@ -4487,7 +4650,7 @@ index fc94719f702f23da8de5340d7f9e9b9d0c9d7c66..151ccc0fe93a7d216677b20e904f0069
String getPage(int page);
/**
-@@ -141,15 +246,19 @@ public interface BookMeta extends ItemMeta {
+@@ -39,15 +143,19 @@ public interface WritableBookMeta extends ItemMeta {
*
* @param page the page number to set, in range [1, getPageCount()]
* @param data the data to set for that page
@@ -4507,7 +4670,7 @@ index fc94719f702f23da8de5340d7f9e9b9d0c9d7c66..151ccc0fe93a7d216677b20e904f0069
List getPages();
/**
-@@ -157,7 +266,9 @@ public interface BookMeta extends ItemMeta {
+@@ -55,7 +163,9 @@ public interface WritableBookMeta extends ItemMeta {
* pages. Maximum 100 pages with 1024 characters per page.
*
* @param pages A list of pages to set the book to use
@@ -4517,7 +4680,7 @@ index fc94719f702f23da8de5340d7f9e9b9d0c9d7c66..151ccc0fe93a7d216677b20e904f0069
void setPages(@NotNull List pages);
/**
-@@ -165,7 +276,9 @@ public interface BookMeta extends ItemMeta {
+@@ -63,7 +173,9 @@ public interface WritableBookMeta extends ItemMeta {
* pages. Maximum 100 pages with 1024 characters per page.
*
* @param pages A list of strings, each being a page
@@ -4527,7 +4690,7 @@ index fc94719f702f23da8de5340d7f9e9b9d0c9d7c66..151ccc0fe93a7d216677b20e904f0069
void setPages(@NotNull String... pages);
/**
-@@ -173,7 +286,9 @@ public interface BookMeta extends ItemMeta {
+@@ -71,7 +183,9 @@ public interface WritableBookMeta extends ItemMeta {
* 1024 characters per page.
*
* @param pages A list of strings, each being a page
@@ -4536,162 +4699,6 @@ index fc94719f702f23da8de5340d7f9e9b9d0c9d7c66..151ccc0fe93a7d216677b20e904f0069
+ @Deprecated // Paper
void addPage(@NotNull String... pages);
- /**
-@@ -195,8 +310,10 @@ public interface BookMeta extends ItemMeta {
- *
- * @param page the page number to get
- * @return the page from the book
-+ * @deprecated in favour of {@link #page(int)}
- */
- @NotNull
-+ @Deprecated // Paper
- public BaseComponent[] getPage(int page) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-@@ -210,7 +327,9 @@ public interface BookMeta extends ItemMeta {
- *
- * @param page the page number to set
- * @param data the data to set for that page
-+ * @deprecated in favour of {@link #page(int, net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- public void setPage(int page, @Nullable BaseComponent... data) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-@@ -219,8 +338,10 @@ public interface BookMeta extends ItemMeta {
- * Gets all the pages in the book.
- *
- * @return list of all the pages in the book
-+ * @deprecated in favour of {@link #pages()}
- */
- @NotNull
-+ @Deprecated // Paper
- public List getPages() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-@@ -230,7 +351,9 @@ public interface BookMeta extends ItemMeta {
- * pages. Maximum 50 pages with 256 characters per page.
- *
- * @param pages A list of pages to set the book to use
-+ * @deprecated in favour of {@link #pages(java.util.List)}
- */
-+ @Deprecated // Paper
- public void setPages(@NotNull List pages) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-@@ -240,7 +363,9 @@ public interface BookMeta extends ItemMeta {
- * pages. Maximum 50 pages with 256 characters per page.
- *
- * @param pages A list of component arrays, each being a page
-+ * @deprecated in favour of {@link #pages(net.kyori.adventure.text.Component...)}
- */
-+ @Deprecated // Paper
- public void setPages(@NotNull BaseComponent[]... pages) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-@@ -250,7 +375,9 @@ public interface BookMeta extends ItemMeta {
- * with 256 characters per page.
- *
- * @param pages A list of component arrays, each being a page
-+ * @deprecated in favour of {@link #addPages(net.kyori.adventure.text.Component...)}
- */
-+ @Deprecated // Paper
- public void addPage(@NotNull BaseComponent[]... pages) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index 9f159ac909ad5287b719cee331db5c44654ec547..f1fcc844d563a0108230676dec84ef25485756b3 100644
---- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-+++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-@@ -32,6 +32,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
- */
- boolean hasDisplayName();
-
-+ // Paper start
-+ /**
-+ * Gets the display name.
-+ *
-+ * Plugins should check that {@link #hasDisplayName()} returns true before calling this method.
-+ *
-+ * @return the display name
-+ */
-+ net.kyori.adventure.text.@Nullable Component displayName();
-+
-+ /**
-+ * Sets the display name.
-+ *
-+ * @param displayName the display name to set
-+ */
-+ void displayName(final net.kyori.adventure.text.@Nullable Component displayName);
-+ // Paper end
-+
- /**
- * Gets the display name that is set.
- *
-@@ -39,7 +57,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
- * before calling this method.
- *
- * @return the display name that is set
-+ * @deprecated in favour of {@link #displayName()}
- */
-+ @Deprecated // Paper
- @NotNull
- String getDisplayName();
-
-@@ -47,7 +67,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
- * Sets the display name.
- *
- * @param name the name to set
-+ * @deprecated in favour of {@link #displayName(net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- void setDisplayName(@Nullable String name);
-
- /**
-@@ -82,6 +104,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
- */
- boolean hasLore();
-
-+ // Paper start
-+ /**
-+ * Gets the lore.
-+ *
-+ *
Plugins should check that {@link #hasLore()} returns true before calling this method.
-+ *
-+ * @return the lore
-+ */
-+ @Nullable List lore();
-+
-+ /**
-+ * Sets the lore.
-+ *
-+ * @param lore the lore to set
-+ */
-+ void lore(final @Nullable List lore);
-+ // Paper end
-+
- /**
- * Gets the lore that is set.
- *
-@@ -89,7 +129,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
- * calling this method.
- *
- * @return a list of lore that is set
-+ * @deprecated in favour of {@link #lore()}
- */
-+ @Deprecated // Paper
- @Nullable
- List getLore();
-
-@@ -98,7 +140,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
- * Removes lore when given null.
- *
- * @param lore the lore that will be set
-+ * @deprecated in favour of {@link #lore(List)}
- */
-+ @Deprecated // Paper
- void setLore(@Nullable List lore);
-
/**
diff --git a/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java b/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java
index eb80f24da65918a21a2fa6691eeb64b621febaf4..941fac4eee338870d8c30cb1f64cab572cf54548 100644
@@ -4720,13 +4727,13 @@ index eb80f24da65918a21a2fa6691eeb64b621febaf4..941fac4eee338870d8c30cb1f64cab57
+ // Paper end - adventure
}
diff --git a/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java b/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java
-index ccf02c79e2784de75273f5ad7f83ce5c33a688fe..3fa087d09c7c2d864eea25659951a537359c9589 100644
+index bd512a7840d4686759097ee4cbd8b375c530956b..f2242ddc4085f7e7cdd748d860857822e3d9b007 100644
--- a/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java
+++ b/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java
-@@ -75,4 +75,21 @@ public interface TrimPattern extends Keyed, Translatable {
- * {@link Material#HOST_ARMOR_TRIM_SMITHING_TEMPLATE}.
+@@ -83,4 +83,21 @@ public interface TrimPattern extends Keyed, Translatable {
+ * {@link Material#BOLT_ARMOR_TRIM_SMITHING_TEMPLATE}.
*/
- public static final TrimPattern HOST = Registry.TRIM_PATTERN.get(NamespacedKey.minecraft("host"));
+ public static final TrimPattern BOLT = Registry.TRIM_PATTERN.get(NamespacedKey.minecraft("bolt"));
+
+ // Paper start - adventure
+ /**
@@ -4746,10 +4753,10 @@ index ccf02c79e2784de75273f5ad7f83ce5c33a688fe..3fa087d09c7c2d864eea25659951a537
+ // Paper end - adventure
}
diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java
-index b90fd819a781d3a2117ffa25f0864b1576901f9f..7d4f4970dae6fe4eeea6b6b6810dcecfe20d6e51 100644
+index 4ddddc5d91a5febba2fd4dea3a15092f4ec32a6f..f9803c7483f7458fed1f22ddfda6e7ef03cfc688 100644
--- a/src/main/java/org/bukkit/map/MapCursor.java
+++ b/src/main/java/org/bukkit/map/MapCursor.java
-@@ -10,7 +10,7 @@ public final class MapCursor {
+@@ -12,7 +12,7 @@ public final class MapCursor {
private byte x, y;
private byte direction, type;
private boolean visible;
@@ -4758,7 +4765,7 @@ index b90fd819a781d3a2117ffa25f0864b1576901f9f..7d4f4970dae6fe4eeea6b6b6810dcecf
/**
* Initialize the map cursor.
-@@ -24,7 +24,7 @@ public final class MapCursor {
+@@ -26,7 +26,7 @@ public final class MapCursor {
*/
@Deprecated
public MapCursor(byte x, byte y, byte direction, byte type, boolean visible) {
@@ -4767,7 +4774,7 @@ index b90fd819a781d3a2117ffa25f0864b1576901f9f..7d4f4970dae6fe4eeea6b6b6810dcecf
}
/**
-@@ -37,7 +37,7 @@ public final class MapCursor {
+@@ -39,7 +39,7 @@ public final class MapCursor {
* @param visible Whether the cursor is visible by default.
*/
public MapCursor(byte x, byte y, byte direction, @NotNull Type type, boolean visible) {
@@ -4776,7 +4783,7 @@ index b90fd819a781d3a2117ffa25f0864b1576901f9f..7d4f4970dae6fe4eeea6b6b6810dcecf
}
/**
-@@ -49,7 +49,7 @@ public final class MapCursor {
+@@ -51,7 +51,7 @@ public final class MapCursor {
* @param type The type (color/style) of the map cursor.
* @param visible Whether the cursor is visible by default.
* @param caption cursor caption
@@ -4785,7 +4792,7 @@ index b90fd819a781d3a2117ffa25f0864b1576901f9f..7d4f4970dae6fe4eeea6b6b6810dcecf
*/
@Deprecated
public MapCursor(byte x, byte y, byte direction, byte type, boolean visible, @Nullable String caption) {
-@@ -58,8 +58,42 @@ public final class MapCursor {
+@@ -60,8 +60,42 @@ public final class MapCursor {
setDirection(direction);
setRawType(type);
this.visible = visible;
@@ -4829,7 +4836,7 @@ index b90fd819a781d3a2117ffa25f0864b1576901f9f..7d4f4970dae6fe4eeea6b6b6810dcecf
/**
* Initialize the map cursor.
-@@ -77,7 +111,7 @@ public final class MapCursor {
+@@ -79,7 +113,7 @@ public final class MapCursor {
setDirection(direction);
setType(type);
this.visible = visible;
@@ -4838,7 +4845,7 @@ index b90fd819a781d3a2117ffa25f0864b1576901f9f..7d4f4970dae6fe4eeea6b6b6810dcecf
}
/**
-@@ -200,23 +234,45 @@ public final class MapCursor {
+@@ -202,23 +236,45 @@ public final class MapCursor {
this.visible = visible;
}
diff --git a/patches/api/0009-Paper-Plugins.patch b/patches/api/0009-Paper-Plugins.patch
index f938e2be49..4c0bd33025 100644
--- a/patches/api/0009-Paper-Plugins.patch
+++ b/patches/api/0009-Paper-Plugins.patch
@@ -1545,7 +1545,7 @@ index a88733f1cd1ddb5d85ab1b0e6af4fd5b80bbc1c6..cb530369e667c426c842da356c31304b
/**
diff --git a/src/main/java/org/bukkit/plugin/PluginManager.java b/src/main/java/org/bukkit/plugin/PluginManager.java
-index 41e26451fe12d8e6e0ef73c85731b24b4e3f200c..03213fde8315384ec56c16031cfc606ade2e8091 100644
+index ae3e68562c29992fab627428db3ff0006d8216f9..47153dee66782a00b980ecf15e8774ab6f3d887d 100644
--- a/src/main/java/org/bukkit/plugin/PluginManager.java
+++ b/src/main/java/org/bukkit/plugin/PluginManager.java
@@ -14,7 +14,7 @@ import org.jetbrains.annotations.Nullable;
@@ -1565,7 +1565,7 @@ index 41e26451fe12d8e6e0ef73c85731b24b4e3f200c..03213fde8315384ec56c16031cfc606a
public void registerInterface(@NotNull Class loader) throws IllegalArgumentException;
/**
-@@ -303,4 +304,17 @@ public interface PluginManager {
+@@ -312,4 +313,17 @@ public interface PluginManager {
* @return True if event timings are to be used
*/
public boolean useTimings();
@@ -1584,7 +1584,7 @@ index 41e26451fe12d8e6e0ef73c85731b24b4e3f200c..03213fde8315384ec56c16031cfc606a
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e7666711998eb4e 100644
+index 34830d2815d331a1b611f22eca08f53d815ea08a..40794a8f60f7ba139e69c38e4fcbb7f4333f8608 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -43,6 +43,8 @@ import org.jetbrains.annotations.Nullable;
@@ -1626,7 +1626,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
Preconditions.checkArgument(directory != null, "Directory cannot be null");
Preconditions.checkArgument(directory.isDirectory(), "Directory must be a directory");
-@@ -378,6 +388,15 @@ public final class SimplePluginManager implements PluginManager {
+@@ -389,6 +399,15 @@ public final class SimplePluginManager implements PluginManager {
@Nullable
public synchronized Plugin loadPlugin(@NotNull File file) throws InvalidPluginException, UnknownDependencyException {
Preconditions.checkArgument(file != null, "File cannot be null");
@@ -1642,7 +1642,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
checkUpdate(file);
-@@ -428,12 +447,14 @@ public final class SimplePluginManager implements PluginManager {
+@@ -439,12 +458,14 @@ public final class SimplePluginManager implements PluginManager {
@Override
@Nullable
public synchronized Plugin getPlugin(@NotNull String name) {
@@ -1657,7 +1657,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
return plugins.toArray(new Plugin[plugins.size()]);
}
-@@ -447,6 +468,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -458,6 +479,7 @@ public final class SimplePluginManager implements PluginManager {
*/
@Override
public boolean isPluginEnabled(@NotNull String name) {
@@ -1665,7 +1665,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
Plugin plugin = getPlugin(name);
return isPluginEnabled(plugin);
-@@ -460,6 +482,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -471,6 +493,7 @@ public final class SimplePluginManager implements PluginManager {
*/
@Override
public boolean isPluginEnabled(@Nullable Plugin plugin) {
@@ -1673,7 +1673,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
if ((plugin != null) && (plugins.contains(plugin))) {
return plugin.isEnabled();
} else {
-@@ -469,6 +492,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -480,6 +503,7 @@ public final class SimplePluginManager implements PluginManager {
@Override
public void enablePlugin(@NotNull final Plugin plugin) {
@@ -1681,7 +1681,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
if (!plugin.isEnabled()) {
List pluginCommands = PluginCommandYamlParser.parse(plugin);
-@@ -488,6 +512,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -499,6 +523,7 @@ public final class SimplePluginManager implements PluginManager {
@Override
public void disablePlugins() {
@@ -1689,7 +1689,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
Plugin[] plugins = getPlugins();
for (int i = plugins.length - 1; i >= 0; i--) {
disablePlugin(plugins[i]);
-@@ -496,6 +521,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -507,6 +532,7 @@ public final class SimplePluginManager implements PluginManager {
@Override
public void disablePlugin(@NotNull final Plugin plugin) {
@@ -1697,7 +1697,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
if (plugin.isEnabled()) {
try {
plugin.getPluginLoader().disablePlugin(plugin);
-@@ -540,6 +566,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -551,6 +577,7 @@ public final class SimplePluginManager implements PluginManager {
@Override
public void clearPlugins() {
@@ -1705,7 +1705,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
synchronized (this) {
disablePlugins();
plugins.clear();
-@@ -560,6 +587,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -571,6 +598,7 @@ public final class SimplePluginManager implements PluginManager {
*/
@Override
public void callEvent(@NotNull Event event) {
@@ -1713,7 +1713,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
if (event.isAsynchronous()) {
if (Thread.holdsLock(this)) {
throw new IllegalStateException(event.getEventName() + " cannot be triggered asynchronously from inside synchronized code.");
-@@ -608,6 +636,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -619,6 +647,7 @@ public final class SimplePluginManager implements PluginManager {
@Override
public void registerEvents(@NotNull Listener listener, @NotNull Plugin plugin) {
@@ -1721,7 +1721,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
if (!plugin.isEnabled()) {
throw new IllegalPluginAccessException("Plugin attempted to register " + listener + " while not enabled");
}
-@@ -641,6 +670,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -652,6 +681,7 @@ public final class SimplePluginManager implements PluginManager {
Preconditions.checkArgument(priority != null, "Priority cannot be null");
Preconditions.checkArgument(executor != null, "Executor cannot be null");
Preconditions.checkArgument(plugin != null, "Plugin cannot be null");
@@ -1729,7 +1729,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
if (!plugin.isEnabled()) {
throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
-@@ -688,16 +718,19 @@ public final class SimplePluginManager implements PluginManager {
+@@ -699,16 +729,19 @@ public final class SimplePluginManager implements PluginManager {
@Override
@Nullable
public Permission getPermission(@NotNull String name) {
@@ -1749,7 +1749,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
String name = perm.getName().toLowerCase(java.util.Locale.ENGLISH);
if (permissions.containsKey(name)) {
-@@ -711,21 +744,25 @@ public final class SimplePluginManager implements PluginManager {
+@@ -722,21 +755,25 @@ public final class SimplePluginManager implements PluginManager {
@Override
@NotNull
public Set getDefaultPermissions(boolean op) {
@@ -1775,7 +1775,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
if (perm != null && permissions.containsKey(perm.getName().toLowerCase(java.util.Locale.ENGLISH))) {
defaultPerms.get(true).remove(perm);
defaultPerms.get(false).remove(perm);
-@@ -765,6 +802,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -776,6 +813,7 @@ public final class SimplePluginManager implements PluginManager {
@Override
public void subscribeToPermission(@NotNull String permission, @NotNull Permissible permissible) {
@@ -1783,7 +1783,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
String name = permission.toLowerCase(java.util.Locale.ENGLISH);
Map map = permSubs.get(name);
-@@ -778,6 +816,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -789,6 +827,7 @@ public final class SimplePluginManager implements PluginManager {
@Override
public void unsubscribeFromPermission(@NotNull String permission, @NotNull Permissible permissible) {
@@ -1791,7 +1791,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
String name = permission.toLowerCase(java.util.Locale.ENGLISH);
Map map = permSubs.get(name);
-@@ -793,6 +832,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -804,6 +843,7 @@ public final class SimplePluginManager implements PluginManager {
@Override
@NotNull
public Set getPermissionSubscriptions(@NotNull String permission) {
@@ -1799,7 +1799,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
String name = permission.toLowerCase(java.util.Locale.ENGLISH);
Map map = permSubs.get(name);
-@@ -805,6 +845,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -816,6 +856,7 @@ public final class SimplePluginManager implements PluginManager {
@Override
public void subscribeToDefaultPerms(boolean op, @NotNull Permissible permissible) {
@@ -1807,7 +1807,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
Map map = defSubs.get(op);
if (map == null) {
-@@ -817,6 +858,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -828,6 +869,7 @@ public final class SimplePluginManager implements PluginManager {
@Override
public void unsubscribeFromDefaultPerms(boolean op, @NotNull Permissible permissible) {
@@ -1815,7 +1815,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
Map map = defSubs.get(op);
if (map != null) {
-@@ -831,6 +873,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -842,6 +884,7 @@ public final class SimplePluginManager implements PluginManager {
@Override
@NotNull
public Set getDefaultPermSubscriptions(boolean op) {
@@ -1823,7 +1823,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
Map map = defSubs.get(op);
if (map == null) {
-@@ -843,6 +886,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -854,6 +897,7 @@ public final class SimplePluginManager implements PluginManager {
@Override
@NotNull
public Set getPermissions() {
@@ -1831,7 +1831,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
return new HashSet(permissions.values());
}
-@@ -866,6 +910,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -877,6 +921,7 @@ public final class SimplePluginManager implements PluginManager {
@Override
public boolean useTimings() {
@@ -1839,7 +1839,7 @@ index a69c5d5cad6168aeaae41e8adc319dc8c976b1e2..77f9ebbe675cf1b6a17e98d98e766671
return useTimings;
}
-@@ -877,4 +922,28 @@ public final class SimplePluginManager implements PluginManager {
+@@ -888,4 +933,28 @@ public final class SimplePluginManager implements PluginManager {
public void useTimings(boolean use) {
useTimings = use;
}
diff --git a/patches/api/0011-Timings-v2.patch b/patches/api/0011-Timings-v2.patch
index d2e13bb2d4..7c1d573059 100644
--- a/patches/api/0011-Timings-v2.patch
+++ b/patches/api/0011-Timings-v2.patch
@@ -2854,10 +2854,10 @@ index 0000000000000000000000000000000000000000..3e61a926620a67daec3af54b72a1b911
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index bd1a010bb4e18a16d02549d64333ce7641be7910..07d393152320270e38f495120dd19e35ece73149 100644
+index 6425151b7003a1376977717dca6172efa1864648..e23be80c0ee7d7979b7c62ebce97ed0b2a0e146b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -864,7 +864,6 @@ public final class Bukkit {
+@@ -866,7 +866,6 @@ public final class Bukkit {
*/
public static void reload() {
server.reload();
@@ -2866,10 +2866,10 @@ index bd1a010bb4e18a16d02549d64333ce7641be7910..07d393152320270e38f495120dd19e35
/**
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6aed59819cc3d70f1b5975c3c7df40cc0b0afd8a..baa02b5223769755670c611ca4d6acc7bf202116 100644
+index 3bf7db7eac81e3cc6f5c6700637d10d1b4b7a47b..77f8b0889cd7039bf041fc052fba33b60aa77e17 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -1928,6 +1928,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1947,6 +1947,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -2949,7 +2949,7 @@ index 0000000000000000000000000000000000000000..f9a00aecca5ec41b460bf41dfe1c6969
+ }
+}
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 75759131bd94b672bec4cd8e271ebff1ad391cba..5cfd88eec9bf02e83d77b6fce1a5c14b7687f48b 100644
+index f3cdf13f22aa789ee8cc235b61fda4035b254219..33c0a60e71f4bd29966c10ea60b22f14e56c1de4 100644
--- a/src/main/java/org/bukkit/command/Command.java
+++ b/src/main/java/org/bukkit/command/Command.java
@@ -33,7 +33,8 @@ public abstract class Command {
@@ -3455,10 +3455,10 @@ index 516d7fc7812aac343782861d0d567f54aa578c2a..00000000000000000000000000000000
- // Spigot end
-}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 5c55715c8cdd79f2214b265a81d94a8904c998ea..a714877c44e6a6c5e90d0e0c5bf6eb30937e1037 100644
+index 4e9ba039669c7059180f5776ee2f7188f2dd01b5..5b526d602057ab70b4a058142e01a0195694c28f 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2634,7 +2634,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2678,7 +2678,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Deprecated // Paper
public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable java.util.UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");
@@ -3479,10 +3479,10 @@ index 5c55715c8cdd79f2214b265a81d94a8904c998ea..a714877c44e6a6c5e90d0e0c5bf6eb30
@NotNull
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 77f9ebbe675cf1b6a17e98d98e7666711998eb4e..63389474a2b3f0e283b42e7004aa6a94904a3d17 100644
+index 40794a8f60f7ba139e69c38e4fcbb7f4333f8608..c75fd7ce01ca11535563ad7ebe1944eb61e65600 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -368,7 +368,6 @@ public final class SimplePluginManager implements PluginManager {
+@@ -379,7 +379,6 @@ public final class SimplePluginManager implements PluginManager {
}
}
@@ -3490,7 +3490,7 @@ index 77f9ebbe675cf1b6a17e98d98e7666711998eb4e..63389474a2b3f0e283b42e7004aa6a94
return result.toArray(new Plugin[result.size()]);
}
-@@ -416,9 +415,9 @@ public final class SimplePluginManager implements PluginManager {
+@@ -427,9 +426,9 @@ public final class SimplePluginManager implements PluginManager {
if (result != null) {
plugins.add(result);
@@ -3502,7 +3502,7 @@ index 77f9ebbe675cf1b6a17e98d98e7666711998eb4e..63389474a2b3f0e283b42e7004aa6a94
}
}
-@@ -448,7 +447,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -459,7 +458,7 @@ public final class SimplePluginManager implements PluginManager {
@Nullable
public synchronized Plugin getPlugin(@NotNull String name) {
if (true) {return this.paperPluginManager.getPlugin(name);} // Paper
@@ -3511,7 +3511,7 @@ index 77f9ebbe675cf1b6a17e98d98e7666711998eb4e..63389474a2b3f0e283b42e7004aa6a94
}
@Override
-@@ -676,7 +675,8 @@ public final class SimplePluginManager implements PluginManager {
+@@ -687,7 +686,8 @@ public final class SimplePluginManager implements PluginManager {
throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
}
@@ -3521,7 +3521,7 @@ index 77f9ebbe675cf1b6a17e98d98e7666711998eb4e..63389474a2b3f0e283b42e7004aa6a94
getEventListeners(event).register(new TimedRegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
} else {
getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
-@@ -911,7 +911,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -922,7 +922,7 @@ public final class SimplePluginManager implements PluginManager {
@Override
public boolean useTimings() {
if (true) {return this.paperPluginManager.useTimings();} // Paper
@@ -3530,7 +3530,7 @@ index 77f9ebbe675cf1b6a17e98d98e7666711998eb4e..63389474a2b3f0e283b42e7004aa6a94
}
/**
-@@ -920,7 +920,7 @@ public final class SimplePluginManager implements PluginManager {
+@@ -931,7 +931,7 @@ public final class SimplePluginManager implements PluginManager {
* @param use True if per event timing code should be used
*/
public void useTimings(boolean use) {
diff --git a/patches/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch
index a9ee212a3c..6e7c583872 100644
--- a/patches/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch
+++ b/patches/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch
@@ -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 07d393152320270e38f495120dd19e35ece73149..026c1accb03bdd42981a2eaf9189d7b2fe6e7339 100644
+index e23be80c0ee7d7979b7c62ebce97ed0b2a0e146b..336c0fb1fcde9efb7cb8d15a9fad8c4cbcf28744 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -80,6 +80,20 @@ public final class Bukkit {
+@@ -82,6 +82,20 @@ public final class Bukkit {
return server;
}
@@ -32,10 +32,10 @@ index 07d393152320270e38f495120dd19e35ece73149..026c1accb03bdd42981a2eaf9189d7b2
* Attempts to set the {@link Server} singleton.
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index baa02b5223769755670c611ca4d6acc7bf202116..523f5ac54f7662c7c96182a352236732d2d3b122 100644
+index 77f8b0889cd7039bf041fc052fba33b60aa77e17..09012ce27344c60730b9c5fcde85712a8e7a69fb 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -65,6 +65,18 @@ import org.jetbrains.annotations.Nullable;
+@@ -67,6 +67,18 @@ import org.jetbrains.annotations.Nullable;
*/
public interface Server extends PluginMessageRecipient, net.kyori.adventure.audience.ForwardingAudience { // Paper
@@ -55,7 +55,7 @@ index baa02b5223769755670c611ca4d6acc7bf202116..523f5ac54f7662c7c96182a352236732
* Used for all administrative messages, such as an operator using a
* command.
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 63389474a2b3f0e283b42e7004aa6a94904a3d17..974ff7116b294473ec450757e8a9341540f43dcd 100644
+index c75fd7ce01ca11535563ad7ebe1944eb61e65600..f896cfb30b967b9c21ee94893534201123e6ec72 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -116,9 +116,22 @@ public final class SimplePluginManager implements PluginManager {
diff --git a/patches/api/0013-Player-affects-spawning-API.patch b/patches/api/0013-Player-affects-spawning-API.patch
index 7ec789cb09..4578c494e8 100644
--- a/patches/api/0013-Player-affects-spawning-API.patch
+++ b/patches/api/0013-Player-affects-spawning-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player affects spawning API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a714877c44e6a6c5e90d0e0c5bf6eb30937e1037..35de65a773146c4b4162df777a8ec594a22ca62c 100644
+index 5b526d602057ab70b4a058142e01a0195694c28f..f868eb1609f7c905fe6ebcf088a0a3030af55e92 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2486,6 +2486,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2530,6 +2530,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Deprecated // Paper
public String getLocale();
diff --git a/patches/api/0014-Add-getTPS-method.patch b/patches/api/0014-Add-getTPS-method.patch
index 3a5b0bf7b5..dc2c6a1882 100644
--- a/patches/api/0014-Add-getTPS-method.patch
+++ b/patches/api/0014-Add-getTPS-method.patch
@@ -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 026c1accb03bdd42981a2eaf9189d7b2fe6e7339..d640d6e8e919e410b54920502d7e26f2519d9e3c 100644
+index 336c0fb1fcde9efb7cb8d15a9fad8c4cbcf28744..ea5f1b4085fd2ec355c4c8036f3bc729e30fd1b7 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2070,6 +2070,17 @@ public final class Bukkit {
+@@ -2093,6 +2093,17 @@ public final class Bukkit {
return server.getEntity(uuid);
}
@@ -27,10 +27,10 @@ index 026c1accb03bdd42981a2eaf9189d7b2fe6e7339..d640d6e8e919e410b54920502d7e26f2
* 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 523f5ac54f7662c7c96182a352236732d2d3b122..7ae7db87b8507e726b6c28400bd3e7eb9413ffb0 100644
+index 09012ce27344c60730b9c5fcde85712a8e7a69fb..e37649ce4b3981f2cff96b64ed3bd4093c015346 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -1765,6 +1765,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1784,6 +1784,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@Nullable
Entity getEntity(@NotNull UUID uuid);
diff --git a/patches/api/0016-Entity-Origin-API.patch b/patches/api/0016-Entity-Origin-API.patch
index 79acd7187d..ff7c566968 100644
--- a/patches/api/0016-Entity-Origin-API.patch
+++ b/patches/api/0016-Entity-Origin-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity Origin API
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 474765f40801a766c853018ea6e1adcd010375d2..b0967614bfdba06b5e11c910186aa66ac7e2d503 100644
+index c78fb359bd28b8dc1ba242642ec612e856525993..4e1fb0974d061d5bb64899cac576318d2e6f8bf6 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -780,5 +780,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -791,5 +791,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
default net.kyori.adventure.text.event.HoverEvent asHoverEvent(final @NotNull java.util.function.UnaryOperator 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.customName())));
}
diff --git a/patches/api/0018-Add-view-distance-API.patch b/patches/api/0018-Add-view-distance-API.patch
index 7de7e75f55..717285adff 100644
--- a/patches/api/0018-Add-view-distance-API.patch
+++ b/patches/api/0018-Add-view-distance-API.patch
@@ -8,10 +8,10 @@ Add per player no-tick, tick, and send view distances.
Also add send/no-tick view distance to World.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index b53f24c0368ff4e4f5287f1699643a0c00579031..7176e37b37c0d22605240f3c5fd34ff7846256c9 100644
+index a9858c2559f0921613b19710135cc6e060488e96..890ae536fdaff11055b72b1be0fbf3766a41812c 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
-@@ -2925,6 +2925,66 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2941,6 +2941,66 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@NotNull
public Set getFeatureFlags();
@@ -79,10 +79,10 @@ index b53f24c0368ff4e4f5287f1699643a0c00579031..7176e37b37c0d22605240f3c5fd34ff7
* Gets all generated structures that intersect the chunk at the given
* coordinates.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 35de65a773146c4b4162df777a8ec594a22ca62c..b66f9264ceb38677d7422b47e379a0e860bcac07 100644
+index f868eb1609f7c905fe6ebcf088a0a3030af55e92..5d5d37e2ebbbe4d2641177c7d174059ba29bb688 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2500,6 +2500,82 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2544,6 +2544,82 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param affects Whether the player can affect mob spawning
*/
public void setAffectsSpawning(boolean affects);
diff --git a/patches/api/0021-Expose-server-CommandMap.patch b/patches/api/0021-Expose-server-CommandMap.patch
index 697a4cca7c..b57f0c2eff 100644
--- a/patches/api/0021-Expose-server-CommandMap.patch
+++ b/patches/api/0021-Expose-server-CommandMap.patch
@@ -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 d640d6e8e919e410b54920502d7e26f2519d9e3c..3d6c51fdd549a94a73fa3d19c0937aa2ec72b42e 100644
+index ea5f1b4085fd2ec355c4c8036f3bc729e30fd1b7..c427d9dd916db6fe5078fb570eb57cfbd0766080 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2271,6 +2271,19 @@ public final class Bukkit {
+@@ -2294,6 +2294,19 @@ public final class Bukkit {
return server.getUnsafe();
}
@@ -29,10 +29,10 @@ index d640d6e8e919e410b54920502d7e26f2519d9e3c..3d6c51fdd549a94a73fa3d19c0937aa2
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 7ae7db87b8507e726b6c28400bd3e7eb9413ffb0..95c9016e67c6c17ae8bac35fd01f62eae96ecf6a 100644
+index e37649ce4b3981f2cff96b64ed3bd4093c015346..fbe2f6e349f242a2c4e64e63aa8ffdff7fa7dc81 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -1775,6 +1775,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1794,6 +1794,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
public double[] getTPS();
// Paper end
diff --git a/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index 73014012bc..b1812dae36 100644
--- a/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
Change Javadoc to be accurate
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 3d6c51fdd549a94a73fa3d19c0937aa2ec72b42e..bafbb72996cb0cacf17b5741a7efbb1583277c6e 100644
+index c427d9dd916db6fe5078fb570eb57cfbd0766080..19efe5cb6a8c2dcc5b293ff24caa58c9a57fc083 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -441,6 +441,30 @@ public final class Bukkit {
+@@ -443,6 +443,30 @@ public final class Bukkit {
return server.broadcastMessage(message);
}
@@ -41,10 +41,10 @@ index 3d6c51fdd549a94a73fa3d19c0937aa2ec72b42e..bafbb72996cb0cacf17b5741a7efbb15
* Gets the name of the update folder. The update folder is used to safely
* update plugins at the right moment on a plugin load.
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 95c9016e67c6c17ae8bac35fd01f62eae96ecf6a..7edac90aa6f37c9c3ebbe7260186ae3e279cea0b 100644
+index fbe2f6e349f242a2c4e64e63aa8ffdff7fa7dc81..4c9c14b60eb6fd1d9845632c2c2fa765d882a741 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -370,6 +370,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -372,6 +372,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@Deprecated // Paper
public int broadcastMessage(@NotNull String message);
@@ -76,10 +76,10 @@ index 95c9016e67c6c17ae8bac35fd01f62eae96ecf6a..7edac90aa6f37c9c3ebbe7260186ae3e
* Gets the name of the update folder. The update folder is used to safely
* update plugins at the right moment on a plugin load.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b66f9264ceb38677d7422b47e379a0e860bcac07..0ffe5812e2d59d3fbf56061eea0a2f391cde6758 100644
+index 5d5d37e2ebbbe4d2641177c7d174059ba29bb688..881c75e84ef31390a3519549985af2711e2828b5 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1172,6 +1172,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1216,6 +1216,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void sendMap(@NotNull MapView map);
diff --git a/patches/api/0023-Add-exception-reporting-event.patch b/patches/api/0023-Add-exception-reporting-event.patch
index 8b7d7bf596..d9e743cbd2 100644
--- a/patches/api/0023-Add-exception-reporting-event.patch
+++ b/patches/api/0023-Add-exception-reporting-event.patch
@@ -496,10 +496,10 @@ index 4205649948a9e2a72f64c3f007112245abac6d50..b3b32ce429edbf1ed040354dbe28ab86
}
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 974ff7116b294473ec450757e8a9341540f43dcd..fc2dae69165776d08274e34a69962cc70445f411 100644
+index f896cfb30b967b9c21ee94893534201123e6ec72..2ff417f91492a441085ac1b7ddd248726f05de0a 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -515,7 +515,8 @@ public final class SimplePluginManager implements PluginManager {
+@@ -526,7 +526,8 @@ public final class SimplePluginManager implements PluginManager {
try {
plugin.getPluginLoader().enablePlugin(plugin);
} catch (Throwable ex) {
@@ -509,7 +509,7 @@ index 974ff7116b294473ec450757e8a9341540f43dcd..fc2dae69165776d08274e34a69962cc7
}
HandlerList.bakeAll();
-@@ -538,32 +539,37 @@ public final class SimplePluginManager implements PluginManager {
+@@ -549,32 +550,37 @@ public final class SimplePluginManager implements PluginManager {
try {
plugin.getPluginLoader().disablePlugin(plugin);
} catch (Throwable ex) {
@@ -552,7 +552,7 @@ index 974ff7116b294473ec450757e8a9341540f43dcd..fc2dae69165776d08274e34a69962cc7
}
try {
-@@ -576,6 +582,13 @@ public final class SimplePluginManager implements PluginManager {
+@@ -587,6 +593,13 @@ public final class SimplePluginManager implements PluginManager {
}
}
@@ -566,7 +566,7 @@ index 974ff7116b294473ec450757e8a9341540f43dcd..fc2dae69165776d08274e34a69962cc7
@Override
public void clearPlugins() {
if (true) {this.paperPluginManager.clearPlugins(); return;} // Paper
-@@ -641,7 +654,13 @@ public final class SimplePluginManager implements PluginManager {
+@@ -652,7 +665,13 @@ public final class SimplePluginManager implements PluginManager {
));
}
} catch (Throwable ex) {
diff --git a/patches/api/0026-Player-Tab-List-and-Title-APIs.patch b/patches/api/0026-Player-Tab-List-and-Title-APIs.patch
index f918234392..10fbe0175b 100644
--- a/patches/api/0026-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/api/0026-Player-Tab-List-and-Title-APIs.patch
@@ -432,10 +432,10 @@ index 0000000000000000000000000000000000000000..9e90c3df567a65b48a0b9341f784eb90
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0ffe5812e2d59d3fbf56061eea0a2f391cde6758..ba58936116ce1e2e805a03251bb19484058e4f0f 100644
+index 881c75e84ef31390a3519549985af2711e2828b5..fc8c807ae9793452bbf3fbab5e72d05676e6fa83 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1206,6 +1206,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1250,6 +1250,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
spigot().sendMessage(position, components);
}
diff --git a/patches/api/0027-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/api/0027-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index d8850b339e..471ee35ff8 100644
--- a/patches/api/0027-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/patches/api/0027-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -7,7 +7,7 @@ Upstream added methods for this so the original methods
are now deprecated
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 67632eae9249f2c65a9dfe04c72a3002a9e8b25b..10eeb304bc0785e0ea182ac99d32ed2554b4755f 100644
+index 67115810d5e837f154c3accd92dbb5e4192d264f..32e89741ffd895e31af0104a0126c2f72742a1bb 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -243,12 +243,44 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -56,7 +56,7 @@ index 67632eae9249f2c65a9dfe04c72a3002a9e8b25b..10eeb304bc0785e0ea182ac99d32ed25
/**
* Returns the living entity's current maximum no damage ticks.
-@@ -775,4 +807,24 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -777,4 +809,24 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @return Whether the entity is invisible
*/
public boolean isInvisible();
diff --git a/patches/api/0028-Complete-resource-pack-API.patch b/patches/api/0028-Complete-resource-pack-API.patch
index 3a19d14165..30d84dbda9 100644
--- a/patches/api/0028-Complete-resource-pack-API.patch
+++ b/patches/api/0028-Complete-resource-pack-API.patch
@@ -5,10 +5,10 @@ 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 ba58936116ce1e2e805a03251bb19484058e4f0f..6a8f5720ef33b54b3a89d4299462827ab304e0d9 100644
+index fc8c807ae9793452bbf3fbab5e72d05676e6fa83..6a7d63691fa3be09da0ade66cf07a41ae08d4190 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2163,6 +2163,180 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2207,6 +2207,180 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
void setResourcePack(@NotNull UUID uuid, @NotNull String url, byte @Nullable [] hash, net.kyori.adventure.text.@Nullable Component prompt, boolean force);
// Paper end
diff --git a/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch b/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch
index b3773538b8..e0fa8b2dd0 100644
--- a/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch
@@ -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 bafbb72996cb0cacf17b5741a7efbb1583277c6e..0ce6fda182e4d87b1ef7abe4d8bd9e3a06891412 100644
+index 19efe5cb6a8c2dcc5b293ff24caa58c9a57fc083..c9be84560ee18ffe1bb84f159b2ed61c79f9e971 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2306,6 +2306,13 @@ public final class Bukkit {
+@@ -2329,6 +2329,13 @@ public final class Bukkit {
public static org.bukkit.command.CommandMap getCommandMap() {
return server.getCommandMap();
}
@@ -24,10 +24,10 @@ index bafbb72996cb0cacf17b5741a7efbb1583277c6e..0ce6fda182e4d87b1ef7abe4d8bd9e3a
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7edac90aa6f37c9c3ebbe7260186ae3e279cea0b..f9dcb6728afb646f9c27e6642bb3b0d91e4448e9 100644
+index 4c9c14b60eb6fd1d9845632c2c2fa765d882a741..c0c61a29ba8d3c95ff76c36e4333740320302b4a 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -2036,4 +2036,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2055,4 +2055,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
Spigot spigot();
// Spigot end
diff --git a/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch b/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch
index 2c0c9c2344..d0b3ec2335 100644
--- a/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch
@@ -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 0ce6fda182e4d87b1ef7abe4d8bd9e3a06891412..cf5cf4375f3a0bd68bb00dc061a039c9c1de0b5e 100644
+index c9be84560ee18ffe1bb84f159b2ed61c79f9e971..2dfd0080a0b0f05c5e5defa4326e0da9b85c2df5 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2313,6 +2313,15 @@ public final class Bukkit {
+@@ -2336,6 +2336,15 @@ public final class Bukkit {
public static void reloadPermissions() {
server.reloadPermissions();
}
@@ -26,10 +26,10 @@ index 0ce6fda182e4d87b1ef7abe4d8bd9e3a06891412..cf5cf4375f3a0bd68bb00dc061a039c9
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f9dcb6728afb646f9c27e6642bb3b0d91e4448e9..d15b926de36f29ced80e0cfef7594ce0646b988e 100644
+index c0c61a29ba8d3c95ff76c36e4333740320302b4a..422a000ec33163f2f07502a05302b5d8851b2318 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -2038,4 +2038,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2057,4 +2057,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
// Spigot end
void reloadPermissions(); // Paper
diff --git a/patches/api/0047-Add-String-based-Action-Bar-API.patch b/patches/api/0047-Add-String-based-Action-Bar-API.patch
index fd2181f8a0..1420aad8b9 100644
--- a/patches/api/0047-Add-String-based-Action-Bar-API.patch
+++ b/patches/api/0047-Add-String-based-Action-Bar-API.patch
@@ -5,10 +5,10 @@ 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 6a8f5720ef33b54b3a89d4299462827ab304e0d9..83f9026e86223bc763990a90da5fda26dec2785f 100644
+index 6a7d63691fa3be09da0ade66cf07a41ae08d4190..252390260f62ee945c21267cd8717b7725158a21 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1173,6 +1173,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1217,6 +1217,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public void sendMap(@NotNull MapView map);
// Paper start
@@ -48,7 +48,7 @@ index 6a8f5720ef33b54b3a89d4299462827ab304e0d9..83f9026e86223bc763990a90da5fda26
/**
* Sends the component to the player
*
-@@ -1200,9 +1233,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1244,9 +1277,11 @@ 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
*
diff --git a/patches/api/0052-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/api/0052-Provide-E-TE-Chunk-count-stat-methods.patch
index f53ba6d986..65bf8c19a6 100644
--- a/patches/api/0052-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/patches/api/0052-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
which creates copy of the collections.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 7176e37b37c0d22605240f3c5fd34ff7846256c9..2b38b328187b853f5b36d796d3b6b359497647d8 100644
+index 890ae536fdaff11055b72b1be0fbf3766a41812c..4dc687f16a8181876fb7b3e56b39a55ea5507408 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -49,6 +49,33 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch
index a04f9b446f..39e334dd8c 100644
--- a/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -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 cf5cf4375f3a0bd68bb00dc061a039c9c1de0b5e..5f758640ae71bca8c5e532af21362011a0aafb89 100644
+index 2dfd0080a0b0f05c5e5defa4326e0da9b85c2df5..6b3a332f556e7c49796a62f20fd33241bbcde09e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2322,6 +2322,16 @@ public final class Bukkit {
+@@ -2345,6 +2345,16 @@ public final class Bukkit {
public static boolean reloadCommandAliases() {
return server.reloadCommandAliases();
}
@@ -27,10 +27,10 @@ index cf5cf4375f3a0bd68bb00dc061a039c9c1de0b5e..5f758640ae71bca8c5e532af21362011
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d15b926de36f29ced80e0cfef7594ce0646b988e..e3136651ce083e67a1a7cb976d27df5666843401 100644
+index 422a000ec33163f2f07502a05302b5d8851b2318..9088bd9dfb515381d5df1c255ae3319f9cdde81e 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -2040,4 +2040,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2059,4 +2059,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
void reloadPermissions(); // Paper
boolean reloadCommandAliases(); // Paper
@@ -46,7 +46,7 @@ index d15b926de36f29ced80e0cfef7594ce0646b988e..e3136651ce083e67a1a7cb976d27df56
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 5cfd88eec9bf02e83d77b6fce1a5c14b7687f48b..1c6205cc667bbec8f6aca479f13b3e9cfcd63ab2 100644
+index 33c0a60e71f4bd29966c10ea60b22f14e56c1de4..f7b78198d9983610fc2185124c3080e6b1c0fa35 100644
--- a/src/main/java/org/bukkit/command/Command.java
+++ b/src/main/java/org/bukkit/command/Command.java
@@ -99,7 +99,7 @@ public abstract class Command {
diff --git a/patches/api/0056-Fix-upstream-javadocs.patch b/patches/api/0056-Fix-upstream-javadocs.patch
index f31a77e295..aa59cb418a 100644
--- a/patches/api/0056-Fix-upstream-javadocs.patch
+++ b/patches/api/0056-Fix-upstream-javadocs.patch
@@ -49,10 +49,10 @@ index a04cde615f8c4bc593f8d9f8f6f1438008aaa707..548f6d28c28d74bed8b58ee828759093
* @param target the target to remove from this list
*/
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 5f758640ae71bca8c5e532af21362011a0aafb89..2bdba56855d3427a1c48bfada0e6416085386cdb 100644
+index 6b3a332f556e7c49796a62f20fd33241bbcde09e..3b7087d5c71a498f513f67514db9e118780363c7 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1494,6 +1494,8 @@ public final class Bukkit {
+@@ -1506,6 +1506,8 @@ public final class Bukkit {
/**
* Gets every player that has ever played on this server.
@@ -114,10 +114,10 @@ index 4c9fd558fbf7f57a948fbb7f80f4651048c0fb57..458119a9ef7ce8e1f59bd47caa5b4bc6
* @param statePredicate The predicate which should get used to test if a block should be set or not.
* @return true if the tree was created successfully, otherwise false
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e3136651ce083e67a1a7cb976d27df5666843401..50e8c25cc378b02b09ef57643cc753fa58ec1166 100644
+index 9088bd9dfb515381d5df1c255ae3319f9cdde81e..012b5954a2f9dc61fb8ad29c4b8bce2648ddc681 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -568,13 +568,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -570,13 +570,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*
*
* Note: If set to 0, {@link SpawnCategory} mobs spawning will be disabled.
@@ -132,7 +132,7 @@ index e3136651ce083e67a1a7cb976d27df5666843401..50e8c25cc378b02b09ef57643cc753fa
*/
public int getTicksPerSpawns(@NotNull SpawnCategory spawnCategory);
-@@ -1274,6 +1271,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1284,6 +1281,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
/**
* Gets every player that has ever played on this server.
@@ -142,10 +142,10 @@ index e3136651ce083e67a1a7cb976d27df5666843401..50e8c25cc378b02b09ef57643cc753fa
* @return an array containing all previous players
*/
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 2b38b328187b853f5b36d796d3b6b359497647d8..a55e92dc09202437abac9cb5b7aacf3c275f5b9c 100644
+index 4dc687f16a8181876fb7b3e56b39a55ea5507408..98e3c12801cc36c868f08b15d1188295ea4364e0 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
-@@ -2723,7 +2723,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2739,7 +2739,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
/**
* Find the closest nearby structure of a given {@link StructureType}.
* Finding unexplored structures can, and will, block if the world is
@@ -154,7 +154,7 @@ index 2b38b328187b853f5b36d796d3b6b359497647d8..a55e92dc09202437abac9cb5b7aacf3c
* temporarily freezing while locating an unexplored structure.
*
* The {@code radius} is not a rigid square radius. Each structure may alter
-@@ -2757,7 +2757,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2773,7 +2773,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
/**
* Find the closest nearby structure of a given {@link StructureType}.
* Finding unexplored structures can, and will, block if the world is
@@ -163,7 +163,7 @@ index 2b38b328187b853f5b36d796d3b6b359497647d8..a55e92dc09202437abac9cb5b7aacf3c
* temporarily freezing while locating an unexplored structure.
*
* The {@code radius} is not a rigid square radius. Each structure may alter
-@@ -2790,7 +2790,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2806,7 +2806,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
/**
* Find the closest nearby structure of a given {@link Structure}. Finding
* unexplored structures can, and will, block if the world is looking in
@@ -343,10 +343,10 @@ index 91fc11dda99de506be83d40df8929bf7cd8e8d85..7dc631ebd009f5f5c3ac1699c3f3515c
// Paper end
}
diff --git a/src/main/java/org/bukkit/entity/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java
-index 8eb0cf31b1ce6d714a14cf65bbb117ff163ae2f3..8e57082e8b19a2fd9625816c2ea4a90d41f78ca5 100644
+index bd1116adc891b2a4243da205127f5ece76089925..4d4c9efb81ac14950b24a07edcfe1c46ab3caf91 100644
--- a/src/main/java/org/bukkit/entity/Arrow.java
+++ b/src/main/java/org/bukkit/entity/Arrow.java
-@@ -93,7 +93,7 @@ public interface Arrow extends AbstractArrow {
+@@ -73,7 +73,7 @@ public interface Arrow extends AbstractArrow {
* Removes a custom potion effect from this arrow.
*
* @param type the potion effect type to remove
@@ -426,10 +426,10 @@ index ae9eaaa8e38e1d9dfc459926c7fc51ddb89de84a..b2ec535bb1b0ce0c114ddd7638b90218
@Override
public int getConversionTime();
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 83f9026e86223bc763990a90da5fda26dec2785f..d507aeb5b906b5b68d1daa5bfd2d98ede1b0e7b6 100644
+index 252390260f62ee945c21267cd8717b7725158a21..cd00d2a064ee4c86b394a7861182fba9cf79cfb3 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -434,15 +434,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -478,15 +478,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
/**
* Saves the players current location, health, inventory, motion, and
@@ -449,7 +449,7 @@ index 83f9026e86223bc763990a90da5fda26dec2785f..d507aeb5b906b5b68d1daa5bfd2d98ed
*
* Note: This will overwrite the players current inventory, health,
* motion, etc, with the state from the saved dat file.
-@@ -779,7 +779,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -823,7 +823,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
/**
* Plays an effect to just this player.
*
@@ -458,7 +458,7 @@ index 83f9026e86223bc763990a90da5fda26dec2785f..d507aeb5b906b5b68d1daa5bfd2d98ed
* @param loc the location to play the effect at
* @param effect the {@link Effect}
* @param data a data bit needed for some effects
-@@ -1190,7 +1190,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1234,7 +1234,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* Use supplied alternative character to the section symbol to represent legacy color codes.
*
@@ -467,7 +467,7 @@ index 83f9026e86223bc763990a90da5fda26dec2785f..d507aeb5b906b5b68d1daa5bfd2d98ed
* @param message The message to send
* @deprecated use {@link #sendActionBar(net.kyori.adventure.text.Component)}
*/
-@@ -1656,7 +1656,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1700,7 +1700,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
/**
* Allows this player to see a player that was previously hidden. If
@@ -476,7 +476,7 @@ index 83f9026e86223bc763990a90da5fda26dec2785f..d507aeb5b906b5b68d1daa5bfd2d98ed
* remain hidden until the other plugin calls this method too.
*
* @param plugin Plugin that wants to show the player
-@@ -1683,7 +1683,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1727,7 +1727,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
/**
* Allows this player to see an entity that was previously hidden. If
@@ -485,7 +485,7 @@ index 83f9026e86223bc763990a90da5fda26dec2785f..d507aeb5b906b5b68d1daa5bfd2d98ed
* remain hidden until the other plugin calls this method too.
*
* @param plugin Plugin that wants to show the entity
-@@ -1766,9 +1766,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1810,9 +1810,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* case this method will have no affect on them. Use the
* {@link PlayerResourcePackStatusEvent} to figure out whether or not
* the player loaded the pack!
@@ -495,7 +495,7 @@ index 83f9026e86223bc763990a90da5fda26dec2785f..d507aeb5b906b5b68d1daa5bfd2d98ed
*
The request is send with "null" as the hash. This might result
* in newer versions not loading the pack correctly.
*
-@@ -1802,9 +1799,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1846,9 +1843,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* case this method will have no affect on them. Use the
* {@link PlayerResourcePackStatusEvent} to figure out whether or not
* the player loaded the pack!
@@ -505,7 +505,7 @@ index 83f9026e86223bc763990a90da5fda26dec2785f..d507aeb5b906b5b68d1daa5bfd2d98ed
* The request is send with empty string as the hash. This might result
* in newer versions not loading the pack correctly.
*
-@@ -1841,9 +1835,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1885,9 +1879,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* case this method will have no affect on them. Use the
* {@link PlayerResourcePackStatusEvent} to figure out whether or not
* the player loaded the pack!
@@ -1438,10 +1438,10 @@ index 07c3dff4d6190ef388d9c1e1c36f67f00a3e8e66..597a18a767b68b47e81454b7d44613c7
* @param input The input choice.
* @return The changed recipe, so you can chain calls.
diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index f1fcc844d563a0108230676dec84ef25485756b3..80836c5f87c15d688f27af5247b4e114cea7028d 100644
+index d7c178b3584db5866a5a21c6ddaab876b94058b9..dff32cedf47e95fe14a865898d76b62748dee5f3 100644
--- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-@@ -311,7 +311,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -483,7 +483,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
/**
* Return an immutable copy of all {@link Attribute}s and their
* {@link AttributeModifier}s for a given {@link EquipmentSlot}.
diff --git a/patches/api/0060-Basic-PlayerProfile-API.patch b/patches/api/0060-Basic-PlayerProfile-API.patch
index 4a664dab73..b4bd6d5e6f 100644
--- a/patches/api/0060-Basic-PlayerProfile-API.patch
+++ b/patches/api/0060-Basic-PlayerProfile-API.patch
@@ -321,10 +321,10 @@ index 0000000000000000000000000000000000000000..7b3b6ef533d32169fbeca389bd61cfc6
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 2bdba56855d3427a1c48bfada0e6416085386cdb..48cce5c4a31ce9df3f2fe0aba4dd50e0547493b6 100644
+index 3b7087d5c71a498f513f67514db9e118780363c7..b165a4f99802ced243f1fb56af2bcf2c2ab7abf1 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2334,6 +2334,83 @@ public final class Bukkit {
+@@ -2357,6 +2357,83 @@ public final class Bukkit {
public static boolean suggestPlayerNamesWhenNullTabCompletions() {
return server.suggestPlayerNamesWhenNullTabCompletions();
}
@@ -409,10 +409,10 @@ index 2bdba56855d3427a1c48bfada0e6416085386cdb..48cce5c4a31ce9df3f2fe0aba4dd50e0
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 50e8c25cc378b02b09ef57643cc753fa58ec1166..7bbd014aa3ecbae15518d9ebe4e6ec03a870ed5e 100644
+index 012b5954a2f9dc61fb8ad29c4b8bce2648ddc681..8e4bf531c0a2f7101c2a3733fe33733d31c611fd 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -2048,5 +2048,74 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2067,5 +2067,74 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return true if player names should be suggested
*/
boolean suggestPlayerNamesWhenNullTabCompletions();
diff --git a/patches/api/0063-Entity-fromMobSpawner.patch b/patches/api/0063-Entity-fromMobSpawner.patch
index 99bfacca7d..cf3a1dbcb7 100644
--- a/patches/api/0063-Entity-fromMobSpawner.patch
+++ b/patches/api/0063-Entity-fromMobSpawner.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity#fromMobSpawner()
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index b0967614bfdba06b5e11c910186aa66ac7e2d503..b422a949b22edf412b518abb3e5ca0847c73d36b 100644
+index 4e1fb0974d061d5bb64899cac576318d2e6f8bf6..45f475b42bbef1c5dc461b3891a48c8fb6feefd3 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -790,5 +790,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -801,5 +801,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
@Nullable
Location getOrigin();
diff --git a/patches/api/0068-LivingEntity-setKiller.patch b/patches/api/0068-LivingEntity-setKiller.patch
index bab1378afb..fb3719a679 100644
--- a/patches/api/0068-LivingEntity-setKiller.patch
+++ b/patches/api/0068-LivingEntity-setKiller.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity#setKiller
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 10eeb304bc0785e0ea182ac99d32ed2554b4755f..40634f46fa238a68f70f19b664bad7400ef07709 100644
+index 32e89741ffd895e31af0104a0126c2f72742a1bb..f154c5607b1dc3585052d9f02cf8b28cf8a3c886 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -365,6 +365,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0077-Expose-client-protocol-version-and-virtual-host.patch b/patches/api/0077-Expose-client-protocol-version-and-virtual-host.patch
index 95708e688a..5c858d8508 100644
--- a/patches/api/0077-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/api/0077-Expose-client-protocol-version-and-virtual-host.patch
@@ -57,10 +57,10 @@ index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b
+
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d507aeb5b906b5b68d1daa5bfd2d98ede1b0e7b6..74ccef3361a8089a2bf03cc3d2e0826f067b647e 100644
+index cd00d2a064ee4c86b394a7861182fba9cf79cfb3..401a43573eb84c1192261377a8b58dd73b895d76 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -54,7 +54,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -56,7 +56,7 @@ import org.jetbrains.annotations.Nullable;
/**
* Represents a player, connected or not
*/
diff --git a/patches/api/0081-Ability-to-apply-mending-to-XP-API.patch b/patches/api/0081-Ability-to-apply-mending-to-XP-API.patch
index 5515a779ea..426ac50e39 100644
--- a/patches/api/0081-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/api/0081-Ability-to-apply-mending-to-XP-API.patch
@@ -10,10 +10,10 @@ of giving the player experience points.
Both an API To standalone mend, and apply mending logic to .giveExp has been added.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 74ccef3361a8089a2bf03cc3d2e0826f067b647e..8ec100779944579f83cfc1be4b124a4c780cdc07 100644
+index 401a43573eb84c1192261377a8b58dd73b895d76..8b92f258a85b4184d67d0af396c18400ded38a67 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1499,6 +1499,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1543,6 +1543,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void resetPlayerWeather();
@@ -29,7 +29,7 @@ index 74ccef3361a8089a2bf03cc3d2e0826f067b647e..8ec100779944579f83cfc1be4b124a4c
/**
* Gets the player's cooldown between picking up experience orbs.
*
-@@ -1524,8 +1533,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1568,8 +1577,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Gives the player the amount of experience specified.
*
* @param amount Exp amount to give
diff --git a/patches/api/0090-Add-more-fields-to-AsyncPreLoginEvent.patch b/patches/api/0090-Add-more-fields-to-AsyncPreLoginEvent.patch
index 21b5ed3e5f..5159a46def 100644
--- a/patches/api/0090-Add-more-fields-to-AsyncPreLoginEvent.patch
+++ b/patches/api/0090-Add-more-fields-to-AsyncPreLoginEvent.patch
@@ -7,50 +7,43 @@ Co-authored-by: Connor Linfoot
Co-authored-by: MCMDEV
diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-index 3432872303aa0df97b5d9090fe98b269ef3cb9f4..bdb7d2345e7d3a48a2f0561832ce126a16781e89 100644
+index 004f1fd55c143e6c21be74d0a6b9ee8b2e12cc59..ae02788536d0c6736aba4ccf812844df4f9789f1 100644
--- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
+++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-@@ -2,6 +2,8 @@ package org.bukkit.event.player;
-
- import java.net.InetAddress;
- import java.util.UUID;
-+import com.destroystokyo.paper.profile.PlayerProfile;
-+import org.bukkit.Bukkit;
- import org.bukkit.event.Event;
- import org.bukkit.event.HandlerList;
- import org.jetbrains.annotations.NotNull;
-@@ -22,9 +24,10 @@ public class AsyncPlayerPreLoginEvent extends Event {
+@@ -22,9 +22,10 @@ public class AsyncPlayerPreLoginEvent extends Event {
private static final HandlerList handlers = new HandlerList();
private Result result;
private net.kyori.adventure.text.Component message; // Paper
- private final String name;
private final InetAddress ipAddress;
- private final UUID uniqueId;
-+ private PlayerProfile profile; // Paper
++ private com.destroystokyo.paper.profile.PlayerProfile profile; // Paper
+ private final InetAddress rawAddress; // Paper
+ private final String hostname; // Paper
+ private final boolean transferred;
@Deprecated
- public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress) {
-@@ -32,12 +35,29 @@ public class AsyncPlayerPreLoginEvent extends Event {
+@@ -38,12 +39,30 @@ public class AsyncPlayerPreLoginEvent extends Event {
}
- public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId) {
+ public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, boolean transferred) {
+ // Paper start
-+ this(name, ipAddress, uniqueId, Bukkit.createProfile(uniqueId, name));
++ this(name, ipAddress, uniqueId, transferred, org.bukkit.Bukkit.createProfile(uniqueId, name));
+ }
+
+ @Deprecated(forRemoval = true)
-+ public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile) {
-+ this(name, ipAddress, ipAddress, uniqueId, profile);
++ public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, boolean transferred, @NotNull com.destroystokyo.paper.profile.PlayerProfile profile) {
++ this(name, ipAddress, ipAddress, uniqueId, transferred, profile);
+ }
+
+ @Deprecated(forRemoval = true)
-+ public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile) {
-+ this(name, ipAddress, rawAddress, uniqueId, profile, "");
++ public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, boolean transferred, @NotNull com.destroystokyo.paper.profile.PlayerProfile profile) {
++ this(name, ipAddress, rawAddress, uniqueId, transferred, profile, "");
+ }
+
-+ public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile, @NotNull String hostname) {
++ @org.jetbrains.annotations.ApiStatus.Internal
++ public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, boolean transferred, @NotNull com.destroystokyo.paper.profile.PlayerProfile profile, @NotNull String hostname) {
++ // Paper end
super(true);
this.result = Result.ALLOWED;
this.message = net.kyori.adventure.text.Component.empty(); // Paper
@@ -58,13 +51,12 @@ index 3432872303aa0df97b5d9090fe98b269ef3cb9f4..bdb7d2345e7d3a48a2f0561832ce126a
+ this.profile = profile;
this.ipAddress = ipAddress;
- this.uniqueId = uniqueId;
-+ this.rawAddress = rawAddress;
-+ this.hostname = hostname;
-+ // Paper end
++ this.rawAddress = rawAddress; // Paper
++ this.hostname = hostname; // Paper
+ this.transferred = transferred;
}
- /**
-@@ -200,7 +220,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
+@@ -207,7 +226,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
*/
@NotNull
public String getName() {
@@ -73,7 +65,7 @@ index 3432872303aa0df97b5d9090fe98b269ef3cb9f4..bdb7d2345e7d3a48a2f0561832ce126a
}
/**
-@@ -220,9 +240,48 @@ public class AsyncPlayerPreLoginEvent extends Event {
+@@ -227,9 +246,48 @@ public class AsyncPlayerPreLoginEvent extends Event {
*/
@NotNull
public UUID getUniqueId() {
@@ -87,7 +79,7 @@ index 3432872303aa0df97b5d9090fe98b269ef3cb9f4..bdb7d2345e7d3a48a2f0561832ce126a
+ * @return The Profile
+ */
+ @NotNull
-+ public PlayerProfile getPlayerProfile() {
++ public com.destroystokyo.paper.profile.PlayerProfile getPlayerProfile() {
+ return profile;
+ }
+
@@ -95,7 +87,7 @@ index 3432872303aa0df97b5d9090fe98b269ef3cb9f4..bdb7d2345e7d3a48a2f0561832ce126a
+ * Changes the PlayerProfile the player will login as
+ * @param profile The profile to use
+ */
-+ public void setPlayerProfile(@NotNull PlayerProfile profile) {
++ public void setPlayerProfile(@NotNull com.destroystokyo.paper.profile.PlayerProfile profile) {
+ this.profile = profile;
+ }
+
@@ -120,6 +112,6 @@ index 3432872303aa0df97b5d9090fe98b269ef3cb9f4..bdb7d2345e7d3a48a2f0561832ce126a
+ }
+ // Paper end
+
- @NotNull
- @Override
- public HandlerList getHandlers() {
+ /**
+ * Gets if this connection has been transferred from another server.
+ *
diff --git a/patches/api/0092-Player.setPlayerProfile-API.patch b/patches/api/0092-Player.setPlayerProfile-API.patch
index 0d0b10e019..c821f93d0d 100644
--- a/patches/api/0092-Player.setPlayerProfile-API.patch
+++ b/patches/api/0092-Player.setPlayerProfile-API.patch
@@ -6,10 +6,10 @@ 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/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 48cce5c4a31ce9df3f2fe0aba4dd50e0547493b6..990436521c4d080d7adbd0a8c55f03690f17c1ec 100644
+index b165a4f99802ced243f1fb56af2bcf2c2ab7abf1..3ea17583766a462317a6a609ac693b5e488e006d 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1336,8 +1336,10 @@ public final class Bukkit {
+@@ -1348,8 +1348,10 @@ public final class Bukkit {
* @return the new PlayerProfile
* @throws IllegalArgumentException if both the unique id is
* null and the name is null or blank
@@ -20,7 +20,7 @@ index 48cce5c4a31ce9df3f2fe0aba4dd50e0547493b6..990436521c4d080d7adbd0a8c55f0369
public static PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name) {
return server.createPlayerProfile(uniqueId, name);
}
-@@ -1348,8 +1350,10 @@ public final class Bukkit {
+@@ -1360,8 +1362,10 @@ public final class Bukkit {
* @param uniqueId the unique id
* @return the new PlayerProfile
* @throws IllegalArgumentException if the unique id is null
@@ -31,7 +31,7 @@ index 48cce5c4a31ce9df3f2fe0aba4dd50e0547493b6..990436521c4d080d7adbd0a8c55f0369
public static PlayerProfile createPlayerProfile(@NotNull UUID uniqueId) {
return server.createPlayerProfile(uniqueId);
}
-@@ -1361,8 +1365,10 @@ public final class Bukkit {
+@@ -1373,8 +1377,10 @@ public final class Bukkit {
* @return the new PlayerProfile
* @throws IllegalArgumentException if the name is null or
* blank
@@ -56,10 +56,10 @@ index ff59479f4782ac7726504aab239de79fdc840cde..abbf3d6f11350ab2dd47a277771d9f46
/**
* Checks if this player has had their profile banned.
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7bbd014aa3ecbae15518d9ebe4e6ec03a870ed5e..c60be47a0ac646133211ab4bf17b4fad4d1893db 100644
+index 8e4bf531c0a2f7101c2a3733fe33733d31c611fd..427b49836becbb0c9e1cb2e94fab7eb1db452ad9 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -1143,8 +1143,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1153,8 +1153,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return the new PlayerProfile
* @throws IllegalArgumentException if both the unique id is
* null and the name is null or blank
@@ -70,7 +70,7 @@ index 7bbd014aa3ecbae15518d9ebe4e6ec03a870ed5e..c60be47a0ac646133211ab4bf17b4fad
PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name);
/**
-@@ -1153,8 +1155,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1163,8 +1165,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @param uniqueId the unique id
* @return the new PlayerProfile
* @throws IllegalArgumentException if the unique id is null
@@ -81,7 +81,7 @@ index 7bbd014aa3ecbae15518d9ebe4e6ec03a870ed5e..c60be47a0ac646133211ab4bf17b4fad
PlayerProfile createPlayerProfile(@NotNull UUID uniqueId);
/**
-@@ -1164,8 +1168,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1174,8 +1178,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return the new PlayerProfile
* @throws IllegalArgumentException if the name is null or
* blank
@@ -93,10 +93,10 @@ index 7bbd014aa3ecbae15518d9ebe4e6ec03a870ed5e..c60be47a0ac646133211ab4bf17b4fad
/**
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8ec100779944579f83cfc1be4b124a4c780cdc07..ecc99524f20e1d7072bfad3ac310cccc4514e40f 100644
+index 8b92f258a85b4184d67d0af396c18400ded38a67..56eed06cd3dbb238330973c1428bffc6d5286019 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3017,6 +3017,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3061,6 +3061,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
}
// Paper end
diff --git a/patches/api/0093-getPlayerUniqueId-API.patch b/patches/api/0093-getPlayerUniqueId-API.patch
index 64497be958..cc120a8b1a 100644
--- a/patches/api/0093-getPlayerUniqueId-API.patch
+++ b/patches/api/0093-getPlayerUniqueId-API.patch
@@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID
This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 990436521c4d080d7adbd0a8c55f03690f17c1ec..4f9ebcd991875d0bf486a8ebb39909f2ac32493b 100644
+index 3ea17583766a462317a6a609ac693b5e488e006d..3e32a6bbf593b269f1af23c7e2fdafaccc0d2110 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -719,6 +719,20 @@ public final class Bukkit {
+@@ -721,6 +721,20 @@ public final class Bukkit {
return server.getPlayer(id);
}
@@ -34,10 +34,10 @@ index 990436521c4d080d7adbd0a8c55f03690f17c1ec..4f9ebcd991875d0bf486a8ebb39909f2
* Gets the plugin manager for interfacing with plugins.
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c60be47a0ac646133211ab4bf17b4fad4d1893db..7c53979f407a6a24c6d16bbfb205a8ac0321e5dc 100644
+index 427b49836becbb0c9e1cb2e94fab7eb1db452ad9..19e6cee94caabfe93c841da783c86a3c283ebcb9 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -617,6 +617,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -619,6 +619,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@Nullable
public Player getPlayer(@NotNull UUID id);
diff --git a/patches/api/0095-Add-openSign-method-to-HumanEntity.patch b/patches/api/0095-Add-openSign-method-to-HumanEntity.patch
index ea763e9a13..4c28dd6d8c 100644
--- a/patches/api/0095-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/api/0095-Add-openSign-method-to-HumanEntity.patch
@@ -36,10 +36,10 @@ index c426bdea5ef71a095cf2af9a8a83a162db3c05b7..2308fa3ca898bcb6c0ac2d4853f82a33
/**
* Make the entity drop the item in their hand.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index ecc99524f20e1d7072bfad3ac310cccc4514e40f..d06f9b4d0117515fb8fcf78d416dcd2b4ef6fb4b 100644
+index 56eed06cd3dbb238330973c1428bffc6d5286019..d68a055ef2b309da6db2de385f27d841adca1f66 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2978,10 +2978,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3022,10 +3022,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
/**
* Open a Sign for editing by the Player.
*
diff --git a/patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch b/patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch
index 4efdc4fed1..c1a286c848 100644
--- a/patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch
+++ b/patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch
@@ -86,10 +86,10 @@ index abbf3d6f11350ab2dd47a277771d9f46221036bd..ef85e57f812c501fac7abe7dd27c9370
/**
* Adds this user to the {@link ProfileBanList}. If a previous ban exists, this will
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d06f9b4d0117515fb8fcf78d416dcd2b4ef6fb4b..3b80cb874dccf2ed4fde4c621f0f022ba1112bcd 100644
+index d68a055ef2b309da6db2de385f27d841adca1f66..9dcec906cea7d4eb6da99ef3100a98218a280594 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1173,6 +1173,186 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1217,6 +1217,186 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public void sendMap(@NotNull MapView map);
// Paper start
diff --git a/patches/api/0099-Additional-world.getNearbyEntities-API-s.patch b/patches/api/0099-Additional-world.getNearbyEntities-API-s.patch
index ef4b091e49..05b73f46b1 100644
--- a/patches/api/0099-Additional-world.getNearbyEntities-API-s.patch
+++ b/patches/api/0099-Additional-world.getNearbyEntities-API-s.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's
Provides more methods to get nearby entities, and filter by types and predicates
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index a55e92dc09202437abac9cb5b7aacf3c275f5b9c..e2cd4750ec51da5e6a93f31a9b644516f64f7972 100644
+index 98e3c12801cc36c868f08b15d1188295ea4364e0..c489140bffdfdfa1e34e71489d308ed10cf10b21 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1,6 +1,9 @@
diff --git a/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch
index 26b74a496c..6d7aa33b1f 100644
--- a/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -594,10 +594,10 @@ index 0000000000000000000000000000000000000000..507343f971fd42eada8ce3346b025daa
+ }
+}
diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index ca6d0eaa9d9a37c07f3e1630b83a79bf98211edb..26d02aa5da444112f8fa84c07e3080bb669983a1 100644
+index 698ffe0c76adeb1b00e7e789ce7d164c6adc759d..690cf2aedf558396a71b20ba2b8ce737c61dfe43 100644
--- a/src/main/java/org/bukkit/Particle.java
+++ b/src/main/java/org/bukkit/Particle.java
-@@ -204,6 +204,18 @@ public enum Particle implements Keyed {
+@@ -207,6 +207,18 @@ public enum Particle implements Keyed {
return key;
}
@@ -617,10 +617,10 @@ index ca6d0eaa9d9a37c07f3e1630b83a79bf98211edb..26d02aa5da444112f8fa84c07e3080bb
* Options which can be applied to redstone dust particles - a particle
* color and size.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index e2cd4750ec51da5e6a93f31a9b644516f64f7972..6f084f081bd20b006c9a8e1090b6ad0e838810cb 100644
+index c489140bffdfdfa1e34e71489d308ed10cf10b21..b6d08d50c26aa0e69d2479d188fc3c690e8ed357 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
-@@ -2905,7 +2905,57 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2921,7 +2921,57 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
*/
diff --git a/patches/api/0110-Make-shield-blocking-delay-configurable.patch b/patches/api/0110-Make-shield-blocking-delay-configurable.patch
index 39f25d89b5..e6c6e635ca 100644
--- a/patches/api/0110-Make-shield-blocking-delay-configurable.patch
+++ b/patches/api/0110-Make-shield-blocking-delay-configurable.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Make shield blocking delay configurable
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 40634f46fa238a68f70f19b664bad7400ef07709..4a4a749449bc561a73e6747386c8ad51e623fc1e 100644
+index f154c5607b1dc3585052d9f02cf8b28cf8a3c886..7b53064364e206bc1a0f4b7af4931f6c658b7c55 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -835,5 +835,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -837,5 +837,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*/
@Deprecated
void setArrowsStuck(int arrows);
diff --git a/patches/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/patches/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index 71a82a8eae..420b0ca896 100644
--- a/patches/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/patches/api/0111-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
Adds ability to get what arrow was shot, and control if it should be consumed.
diff --git a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
-index d4d7ad9c3c953680342c121f39ddaef476549047..719d0d878320c1903b44076053989ba99fa0e92a 100644
+index 1a8366f6757431baaba4f3d48abea3cf0ec1f1ad..1cde639c5dc7e746209488b1a58c2a81080ab3d7 100644
--- a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
@@ -22,7 +22,32 @@ public class EntityShootBowEvent extends EntityEvent implements Cancellable {
diff --git a/patches/api/0115-Expand-Explosions-API.patch b/patches/api/0115-Expand-Explosions-API.patch
index c4c0e69ee6..369694a376 100644
--- a/patches/api/0115-Expand-Explosions-API.patch
+++ b/patches/api/0115-Expand-Explosions-API.patch
@@ -108,10 +108,10 @@ index 3161eae2fa5f03b7d3a5e9945ab659c15cf568c6..af737017ee397f80c44ee02c6cc60cef
/**
* Returns a list of entities within a bounding box centered around a Location.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 6f084f081bd20b006c9a8e1090b6ad0e838810cb..5ec220aa224c210c55517ef47aa5809ee26209e7 100644
+index b6d08d50c26aa0e69d2479d188fc3c690e8ed357..a735dcdb9a0684accf81674b4810928ff20eb7e6 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
-@@ -1391,6 +1391,88 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -1397,6 +1397,88 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
*/
public boolean createExplosion(@NotNull Location loc, float power, boolean setFire);
diff --git a/patches/api/0117-LivingEntity-Active-Item-API.patch b/patches/api/0117-LivingEntity-Active-Item-API.patch
index 1324ec1fdc..268d315eb2 100644
--- a/patches/api/0117-LivingEntity-Active-Item-API.patch
+++ b/patches/api/0117-LivingEntity-Active-Item-API.patch
@@ -23,7 +23,7 @@ index 2308fa3ca898bcb6c0ac2d4853f82a3398bf51f3..15115b1049bc5053796b84539acbf576
/**
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 4a4a749449bc561a73e6747386c8ad51e623fc1e..81a851580f81b2d6f6a2b2ebec38530f1d68530d 100644
+index 7b53064364e206bc1a0f4b7af4931f6c658b7c55..0ed64618b3f62ee984fe4f99dc6a52d5fad7b3cc 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -202,15 +202,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -56,7 +56,7 @@ index 4a4a749449bc561a73e6747386c8ad51e623fc1e..81a851580f81b2d6f6a2b2ebec38530f
public void setItemInUseTicks(int ticks);
/**
-@@ -850,4 +856,130 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -852,4 +858,130 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*/
void setShieldBlockingDelay(int delay);
// Paper end
diff --git a/patches/api/0119-Add-World.getEntity-UUID-API.patch b/patches/api/0119-Add-World.getEntity-UUID-API.patch
index 2b7e2e2815..89065f63d6 100644
--- a/patches/api/0119-Add-World.getEntity-UUID-API.patch
+++ b/patches/api/0119-Add-World.getEntity-UUID-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add World.getEntity(UUID) API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 5ec220aa224c210c55517ef47aa5809ee26209e7..2aafd966778ee0f6adcbb3ea3772cb2104f8e687 100644
+index a735dcdb9a0684accf81674b4810928ff20eb7e6..b34eca520c34c70152860f5bad978cf3bed044fa 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -905,6 +905,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0122-Entity-getChunk-API.patch b/patches/api/0122-Entity-getChunk-API.patch
index 0dbc27f2d1..8a3e473331 100644
--- a/patches/api/0122-Entity-getChunk-API.patch
+++ b/patches/api/0122-Entity-getChunk-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API
Get the chunk the entity is currently registered to
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index b422a949b22edf412b518abb3e5ca0847c73d36b..57a1d07d0430019fd38c72b9f58c7145927ecd02 100644
+index 45f475b42bbef1c5dc461b3891a48c8fb6feefd3..1e43deadce5a1a0e97521b1f69fee3106f5a0b9e 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -3,6 +3,7 @@ package org.bukkit.entity;
@@ -17,7 +17,7 @@ index b422a949b22edf412b518abb3e5ca0847c73d36b..57a1d07d0430019fd38c72b9f58c7145
import org.bukkit.EntityEffect;
import org.bukkit.Location;
import org.bukkit.Nameable;
-@@ -797,5 +798,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -808,5 +809,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
* @return True if entity spawned from a mob spawner
*/
boolean fromMobSpawner();
diff --git a/patches/api/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch b/patches/api/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch
index d2a1664557..2aff921ee0 100644
--- a/patches/api/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch
+++ b/patches/api/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch
@@ -44,7 +44,7 @@ index a25f112f4d679946ddcb5ec9b4d0a0e2d1795bd3..57976bbe682d2309f7d15d5dcd3ad7f8
* Gets the world containing this chunk
*
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 2aafd966778ee0f6adcbb3ea3772cb2104f8e687..9e941753819214e75b9d712bb59e8d49427e6f8b 100644
+index b34eca520c34c70152860f5bad978cf3bed044fa..273c50b6e4f26457415779000cf09aeaffd21733 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -182,6 +182,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch
index 6e66f2ae02..c2205057df 100644
--- a/patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch
+++ b/patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch
@@ -50,7 +50,7 @@ index 41125de49db8eafce4be59cc110ce5be06836a47..042d69e6d4584eb6d678b8ea13a3e4be
* @return A new location where X/Y/Z are the center of the block
*/
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 9e941753819214e75b9d712bb59e8d49427e6f8b..48f2c64491f93e5ac720bdb19a20f3f435a7e888 100644
+index 273c50b6e4f26457415779000cf09aeaffd21733..575fd50b8456beed7c5049a392fca011271a8fe4 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -99,6 +99,41 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0141-isChunkGenerated-API.patch b/patches/api/0141-isChunkGenerated-API.patch
index bfe9b14df9..aba6214696 100644
--- a/patches/api/0141-isChunkGenerated-API.patch
+++ b/patches/api/0141-isChunkGenerated-API.patch
@@ -37,7 +37,7 @@ index 042d69e6d4584eb6d678b8ea13a3e4bea78703b8..02b4ffa6b918269bd64f7c518fcceef1
/**
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 48f2c64491f93e5ac720bdb19a20f3f435a7e888..8bef6168caf0932a5a64cf69eb7988fa3191b13a 100644
+index 575fd50b8456beed7c5049a392fca011271a8fe4..b3098ce9134acf24f49d23fc1babe79c6bf502f1 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -248,6 +248,19 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0143-Async-Chunks-API.patch b/patches/api/0143-Async-Chunks-API.patch
index 30c484e7aa..68867e8a37 100644
--- a/patches/api/0143-Async-Chunks-API.patch
+++ b/patches/api/0143-Async-Chunks-API.patch
@@ -8,7 +8,7 @@ Adds API's to load or generate chunks asynchronously.
Also adds utility methods to Entity to teleport asynchronously.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 8bef6168caf0932a5a64cf69eb7988fa3191b13a..ab183821b93dcfed1e881b481f0a3166f465ecfb 100644
+index b3098ce9134acf24f49d23fc1babe79c6bf502f1..5efe33cef4d9c153d760fc71606721ff8abafbfc 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -950,6 +950,472 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -485,7 +485,7 @@ index 8bef6168caf0932a5a64cf69eb7988fa3191b13a..ab183821b93dcfed1e881b481f0a3166
* Get a list of all players in this World
*
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 57a1d07d0430019fd38c72b9f58c7145927ecd02..8a7a4a8cf5f0b88664859cd43b0b01e6d261715d 100644
+index 1e43deadce5a1a0e97521b1f69fee3106f5a0b9e..f1fc42ad24648ee481b9a5d4c4cc58ae8c0a93c1 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -168,6 +168,39 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0144-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/api/0144-Add-ray-tracing-methods-to-LivingEntity.patch
index 46969f1d74..5a9655eafe 100644
--- a/patches/api/0144-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/api/0144-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -78,7 +78,7 @@ index 0000000000000000000000000000000000000000..c896d172519a8552a132031cb956378d
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 81a851580f81b2d6f6a2b2ebec38530f1d68530d..e6e0e16d122d78a160af549e4419e49dc046fb08 100644
+index 0ed64618b3f62ee984fe4f99dc6a52d5fad7b3cc..b41152d81c1ec89a65eaee2a606f4f1b0d421bc7 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -85,6 +85,98 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0145-Expose-attack-cooldown-methods-for-Player.patch b/patches/api/0145-Expose-attack-cooldown-methods-for-Player.patch
index d91baa6170..0727dbdfbb 100644
--- a/patches/api/0145-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/api/0145-Expose-attack-cooldown-methods-for-Player.patch
@@ -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 3b80cb874dccf2ed4fde4c621f0f022ba1112bcd..5e17bab05276de4340c5f06866f2efce81a9ab65 100644
+index 9dcec906cea7d4eb6da99ef3100a98218a280594..92a83edc03fa8d11f026ac312b989329fa6a7e88 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3219,6 +3219,28 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3263,6 +3263,28 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
void setPlayerProfile(com.destroystokyo.paper.profile.@NotNull PlayerProfile profile);
// Paper end - Player Profile API
diff --git a/patches/api/0147-Add-Git-information-to-version-command-on-startup.patch b/patches/api/0147-Add-Git-information-to-version-command-on-startup.patch
index 847ce11745..6c3f8d857b 100644
--- a/patches/api/0147-Add-Git-information-to-version-command-on-startup.patch
+++ b/patches/api/0147-Add-Git-information-to-version-command-on-startup.patch
@@ -48,10 +48,10 @@ index 0000000000000000000000000000000000000000..909617079db61b675cc7b60b44ef96b3
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 4f9ebcd991875d0bf486a8ebb39909f2ac32493b..c61096f724ea6a1ae7bc8990e9eaa44a16f5847e 100644
+index 3e32a6bbf593b269f1af23c7e2fdafaccc0d2110..d60780a26e10f5f9c80446693552384281327b51 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -58,6 +58,7 @@ import org.bukkit.util.CachedServerIcon;
+@@ -60,6 +60,7 @@ import org.bukkit.util.CachedServerIcon;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -59,7 +59,7 @@ index 4f9ebcd991875d0bf486a8ebb39909f2ac32493b..c61096f724ea6a1ae7bc8990e9eaa44a
/**
* Represents the Bukkit core, for version and Server singleton handling
-@@ -107,7 +108,25 @@ public final class Bukkit {
+@@ -109,7 +110,25 @@ public final class Bukkit {
}
Bukkit.server = server;
diff --git a/patches/api/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index b5c087c089..316ea7f83d 100644
--- a/patches/api/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/patches/api/0149-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
@@ -226,10 +226,10 @@ index 4034fcb9abc39b12f0de47c4b679f2ef82353c89..6fa219aef009f8dfb8a2b1e5ee0603b1
return key;
}
diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index 80836c5f87c15d688f27af5247b4e114cea7028d..f800e776329c1b42f834cb30ebf2d0ace195d1a2 100644
+index dff32cedf47e95fe14a865898d76b62748dee5f3..de38d9b667e04852c7bdccfa17cbabb1512f4c19 100644
--- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-@@ -450,4 +450,87 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -622,4 +622,87 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
@SuppressWarnings("javadoc")
@NotNull
ItemMeta clone();
diff --git a/patches/api/0153-Material-API-additions.patch b/patches/api/0153-Material-API-additions.patch
index bf1a41d231..7fdeb9b3eb 100644
--- a/patches/api/0153-Material-API-additions.patch
+++ b/patches/api/0153-Material-API-additions.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Material API additions
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index e15219c93995ff959a6730c17920618c0cdb3311..55fa9e8385e26aecb5690f623c2893972dc2a234 100644
+index d593dbace48998e5582c2f0c168275e0d59fe1cf..7ce1a0ee5504d4faf548be73be784e87cd4049fe 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
-@@ -121,6 +121,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -122,6 +122,7 @@ import org.jetbrains.annotations.Nullable;
/**
* An enum of all material IDs accepted by the official server and client
*/
@@ -16,7 +16,7 @@ index e15219c93995ff959a6730c17920618c0cdb3311..55fa9e8385e26aecb5690f623c289397
public enum Material implements Keyed, Translatable {
//
AIR(9648, 0),
-@@ -4684,6 +4685,22 @@ public enum Material implements Keyed, Translatable {
+@@ -4722,6 +4723,22 @@ public enum Material implements Keyed, Translatable {
}
}
diff --git a/patches/api/0154-Add-Material-Tags.patch b/patches/api/0154-Add-Material-Tags.patch
index 12194664b8..87e49d154c 100644
--- a/patches/api/0154-Add-Material-Tags.patch
+++ b/patches/api/0154-Add-Material-Tags.patch
@@ -1132,7 +1132,7 @@ index 0000000000000000000000000000000000000000..5376e51adf5af15572b0d760b17f2de6
+ .ensureSize("WATER_BASED", 11).lock();
+}
diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index ec50179dd92402ad016bb2100251db5c5bf9d0c2..894e72aa97cd272ae57a91165cca0737a6d5742d 100644
+index 1be862110e94654be12fcef5980388abf242ac7f..298ae1294a122705bca6bd74ea540185839d1ed5 100644
--- a/src/main/java/org/bukkit/Tag.java
+++ b/src/main/java/org/bukkit/Tag.java
@@ -11,6 +11,10 @@ import org.jetbrains.annotations.NotNull;
diff --git a/patches/api/0156-Add-LivingEntity-getTargetEntity.patch b/patches/api/0156-Add-LivingEntity-getTargetEntity.patch
index 8447dca548..171a95979a 100644
--- a/patches/api/0156-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/api/0156-Add-LivingEntity-getTargetEntity.patch
@@ -51,7 +51,7 @@ index 0000000000000000000000000000000000000000..af8765b213390cf75fe02a6eb68aecf7
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index e6e0e16d122d78a160af549e4419e49dc046fb08..d8ac9ce8e448f8b3bc39ec6c140db0e25d14cec7 100644
+index b41152d81c1ec89a65eaee2a606f4f1b0d421bc7..8cd525dd8ded0ddbd405c66e9c0fbeb40f788521 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -175,6 +175,77 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0157-Add-sun-related-API.patch b/patches/api/0157-Add-sun-related-API.patch
index 59c4495962..7132b29be0 100644
--- a/patches/api/0157-Add-sun-related-API.patch
+++ b/patches/api/0157-Add-sun-related-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add sun related API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index ab183821b93dcfed1e881b481f0a3166f465ecfb..675dea2e1e9742043c18098774b9fde2e6f4602f 100644
+index 5efe33cef4d9c153d760fc71606721ff8abafbfc..b6ca63afb74b345e381d35646cc8faf52a2c7cbc 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1771,6 +1771,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0161-Make-the-default-permission-message-configurable.patch b/patches/api/0161-Make-the-default-permission-message-configurable.patch
index cad7e3c310..8dac5d0ae4 100644
--- a/patches/api/0161-Make-the-default-permission-message-configurable.patch
+++ b/patches/api/0161-Make-the-default-permission-message-configurable.patch
@@ -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 c61096f724ea6a1ae7bc8990e9eaa44a16f5847e..ac84e6d10a337f767477177ef90ad10d754341e6 100644
+index d60780a26e10f5f9c80446693552384281327b51..f248515862c3bc418b42b8e197feb43addfd122d 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2374,6 +2374,28 @@ public final class Bukkit {
+@@ -2397,6 +2397,28 @@ public final class Bukkit {
return server.suggestPlayerNamesWhenNullTabCompletions();
}
@@ -38,10 +38,10 @@ index c61096f724ea6a1ae7bc8990e9eaa44a16f5847e..ac84e6d10a337f767477177ef90ad10d
* Creates a PlayerProfile for the specified uuid, with name as null.
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7c53979f407a6a24c6d16bbfb205a8ac0321e5dc..050cdd5147814b39d158f0ce0fa8f5aa20894cf7 100644
+index 19e6cee94caabfe93c841da783c86a3c283ebcb9..69f236d965c631510b008a7eb38aa1b62a4e196a 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -2067,6 +2067,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2086,6 +2086,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
boolean suggestPlayerNamesWhenNullTabCompletions();
@@ -66,7 +66,7 @@ index 7c53979f407a6a24c6d16bbfb205a8ac0321e5dc..050cdd5147814b39d158f0ce0fa8f5aa
* Creates a PlayerProfile for the specified uuid, with name as null.
*
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 1c6205cc667bbec8f6aca479f13b3e9cfcd63ab2..b791358f90fe92bc2264d9a26492245763813af3 100644
+index f7b78198d9983610fc2185124c3080e6b1c0fa35..b3a2c274f05156fd603bcc7a68ab41265f2eaf44 100644
--- a/src/main/java/org/bukkit/command/Command.java
+++ b/src/main/java/org/bukkit/command/Command.java
@@ -184,10 +184,9 @@ public abstract class Command {
diff --git a/patches/api/0162-Support-cancellation-supression-of-EntityDismount-Ve.patch b/patches/api/0162-Support-cancellation-supression-of-EntityDismount-Ve.patch
index b600b869ba..420a97487d 100644
--- a/patches/api/0162-Support-cancellation-supression-of-EntityDismount-Ve.patch
+++ b/patches/api/0162-Support-cancellation-supression-of-EntityDismount-Ve.patch
@@ -105,47 +105,3 @@ index 963b9ead4ca0426b2e95c5641b0e89317c48853d..39f6afd2f9cbcff6a74a91a21dcc3e29
@NotNull
@Override
public HandlerList getHandlers() {
-diff --git a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
-index be9560ffaa2d136ff1b5cd944baa678c1a938533..6533d1e0c5cb23e4a5e2831a56c5dbebe2d20f76 100644
---- a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
-+++ b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
-@@ -21,10 +21,19 @@ public class EntityDismountEvent extends EntityEvent implements Cancellable {
- private static final HandlerList handlers = new HandlerList();
- private boolean cancelled;
- private final Entity dismounted;
-+ private final boolean isCancellable; // Paper
-
- public EntityDismountEvent(@NotNull Entity what, @NotNull Entity dismounted) {
-- super(what);
-+ // Paper start
-+ this(what, dismounted, true);
-+ }
-+
-+
-+ public EntityDismountEvent(@NotNull Entity what, @NotNull Entity dismounted, boolean isCancellable) {
-+ // Paper end
-+ super( what );
- this.dismounted = dismounted;
-+ this.isCancellable = isCancellable; // Paper
- }
-
- @NotNull
-@@ -39,9 +48,18 @@ public class EntityDismountEvent extends EntityEvent implements Cancellable {
-
- @Override
- public void setCancelled(boolean cancel) {
-+ // Paper start
-+ if (cancel && !isCancellable) {
-+ return;
-+ }
- this.cancelled = cancel;
- }
-
-+ public boolean isCancellable() {
-+ return isCancellable;
-+ // Paper end
-+ }
-+
- @NotNull
- @Override
- public HandlerList getHandlers() {
diff --git a/patches/api/0172-Entity-getEntitySpawnReason.patch b/patches/api/0172-Entity-getEntitySpawnReason.patch
index 25cf10b844..ef25308f6c 100644
--- a/patches/api/0172-Entity-getEntitySpawnReason.patch
+++ b/patches/api/0172-Entity-getEntitySpawnReason.patch
@@ -12,10 +12,10 @@ or DEFAULT since data was not stored.
Co-authored-by: Aurora
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 8a7a4a8cf5f0b88664859cd43b0b01e6d261715d..11a77f977c6abc031cf5a4d58924bc7af5e7ea53 100644
+index f1fc42ad24648ee481b9a5d4c4cc58ae8c0a93c1..66716da0b475524917d4153e481100b795ea11a9 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -842,5 +842,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -853,5 +853,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
// TODO remove impl here
return getLocation().getChunk();
}
diff --git a/patches/api/0173-Fix-Spigot-annotation-mistakes.patch b/patches/api/0173-Fix-Spigot-annotation-mistakes.patch
index 1f17f45353..afaaad281a 100644
--- a/patches/api/0173-Fix-Spigot-annotation-mistakes.patch
+++ b/patches/api/0173-Fix-Spigot-annotation-mistakes.patch
@@ -40,10 +40,10 @@ index ac420f0059fc50d3e1294f85df7515c9e17ff78f..24daba85ce4129fb0babe67570059ca8
public static Art getById(int id) {
return BY_ID.get(id);
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ac84e6d10a337f767477177ef90ad10d754341e6..4716b9a9ebaf3deb0a262d4ea1da492547be4913 100644
+index f248515862c3bc418b42b8e197feb43addfd122d..395d7245aac45a1b805e15ee1fdb9949574f3f59 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -868,9 +868,8 @@ public final class Bukkit {
+@@ -870,9 +870,8 @@ public final class Bukkit {
*
* @param id the id of the map to get
* @return a map view if it exists, or null otherwise
@@ -54,7 +54,7 @@ index ac84e6d10a337f767477177ef90ad10d754341e6..4716b9a9ebaf3deb0a262d4ea1da4925
@Nullable
public static MapView getMap(int id) {
return server.getMap(id);
-@@ -949,8 +948,14 @@ public final class Bukkit {
+@@ -951,8 +950,14 @@ public final class Bukkit {
* Returns the primary logger associated with this server instance.
*
* @return Logger associated with this server
@@ -69,7 +69,7 @@ index ac84e6d10a337f767477177ef90ad10d754341e6..4716b9a9ebaf3deb0a262d4ea1da4925
public static Logger getLogger() {
return server.getLogger();
}
-@@ -1337,10 +1342,8 @@ public final class Bukkit {
+@@ -1349,10 +1354,8 @@ public final class Bukkit {
* @param name the name the player to retrieve
* @return an offline player
* @see #getOfflinePlayer(java.util.UUID)
@@ -81,7 +81,7 @@ index ac84e6d10a337f767477177ef90ad10d754341e6..4716b9a9ebaf3deb0a262d4ea1da4925
@NotNull
public static OfflinePlayer getOfflinePlayer(@NotNull String name) {
return server.getOfflinePlayer(name);
-@@ -1931,7 +1934,7 @@ public final class Bukkit {
+@@ -1954,7 +1957,7 @@ public final class Bukkit {
*
* @return the scoreboard manager or null if no worlds are loaded.
*/
@@ -183,10 +183,10 @@ index bd213cabddd8752e609544f24cfba95405726155..47df858e095c4423c20e49e029d72f0f
public static DyeColor legacyValueOf(@Nullable String name) {
return "SILVER".equals(name) ? DyeColor.LIGHT_GRAY : DyeColor.valueOf(name);
diff --git a/src/main/java/org/bukkit/Effect.java b/src/main/java/org/bukkit/Effect.java
-index 879d637691683ca862045402f74b751a892bf3ff..611b7df0e31de932f15c2f13bd8ed286e0b3b43f 100644
+index 0d0777771485a76d960da2f16e963b19d2cf6c2d..fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38 100644
--- a/src/main/java/org/bukkit/Effect.java
+++ b/src/main/java/org/bukkit/Effect.java
-@@ -358,9 +358,9 @@ public enum Effect {
+@@ -357,9 +357,9 @@ public enum Effect {
* Gets the ID for this effect.
*
* @return ID of this effect
@@ -198,7 +198,7 @@ index 879d637691683ca862045402f74b751a892bf3ff..611b7df0e31de932f15c2f13bd8ed286
public int getId() {
return this.id;
}
-@@ -387,9 +387,9 @@ public enum Effect {
+@@ -386,9 +386,9 @@ public enum Effect {
*
* @param id ID of the Effect to return
* @return Effect with the given ID
@@ -300,10 +300,10 @@ index 02b4ffa6b918269bd64f7c518fcceef1f6990737..f0878c7539696cc0676e6010e88914d3
if (this.world == null) {
return null;
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 55fa9e8385e26aecb5690f623c2893972dc2a234..c24fe19600fa8440c130eaea247d5874da3873ec 100644
+index 7ce1a0ee5504d4faf548be73be784e87cd4049fe..76c96e1a82366aafa0148a1260500a38cea12f37 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
-@@ -4705,20 +4705,20 @@ public enum Material implements Keyed, Translatable {
+@@ -4743,20 +4743,20 @@ public enum Material implements Keyed, Translatable {
* Do not use for any reason.
*
* @return ID of this material
@@ -328,7 +328,7 @@ index 55fa9e8385e26aecb5690f623c2893972dc2a234..c24fe19600fa8440c130eaea247d5874
public boolean isLegacy() {
return legacy;
}
-@@ -4789,8 +4789,10 @@ public enum Material implements Keyed, Translatable {
+@@ -4827,8 +4827,10 @@ public enum Material implements Keyed, Translatable {
* Gets the MaterialData class associated with this Material
*
* @return MaterialData associated with this Material
@@ -339,7 +339,7 @@ index 55fa9e8385e26aecb5690f623c2893972dc2a234..c24fe19600fa8440c130eaea247d5874
public Class getData() {
Preconditions.checkArgument(legacy, "Cannot get data class of Modern Material");
return ctor.getDeclaringClass();
-@@ -9052,7 +9054,11 @@ public enum Material implements Keyed, Translatable {
+@@ -9095,7 +9097,11 @@ public enum Material implements Keyed, Translatable {
* material.
*
* @return true if this material can be interacted with.
@@ -452,47 +452,11 @@ index 48aecc9421c500137bbef1dfe3bec8de277c3ff9..aff858346776386f1288b648b221404f
public byte getId() {
return note;
}
-diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index 26d02aa5da444112f8fa84c07e3080bb669983a1..0cb15350704955f4a1aeff184a8b60d9a9871ded 100644
---- a/src/main/java/org/bukkit/Particle.java
-+++ b/src/main/java/org/bukkit/Particle.java
-@@ -54,7 +54,9 @@ public enum Particle implements Keyed {
- BLOCK_CRACK("block", BlockData.class),
- /**
- * Uses {@link BlockData} as DataType
-+ * @deprecated use {@link #BLOCK_CRACK}
- */
-+ @Deprecated // Paper
- BLOCK_DUST("block", BlockData.class, false),
- WATER_DROP("rain"),
- MOB_APPEARANCE("elder_guardian"),
-@@ -148,15 +150,21 @@ public enum Particle implements Keyed {
- // ----- Legacy Separator -----
- /**
- * Uses {@link MaterialData} as DataType
-+ * @deprecated {@link MaterialData} is deprecated API
- */
-+ @Deprecated // Paper
- LEGACY_BLOCK_CRACK(null, MaterialData.class, false),
- /**
- * Uses {@link MaterialData} as DataType
-+ * @deprecated {@link MaterialData} is deprecated API
- */
-+ @Deprecated // Paper
- LEGACY_BLOCK_DUST(null, MaterialData.class, false),
- /**
- * Uses {@link MaterialData} as DataType
-+ * @deprecated {@link MaterialData} is deprecated API
- */
-+ @Deprecated // Paper
- LEGACY_FALLING_DUST(null, MaterialData.class, false);
-
- private final NamespacedKey key;
diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java
-index db45423936d48835dee35d01ee502cdfdce4f68a..b3f8a2611ceb57f5d0b5c300fa80d8bad121498d 100644
+index ccc84e35dd8b94b5d9ddbac0341c2fae7a8e7115..18be407d4fb401d89f3a46a9bce044bacd8a888f 100644
--- a/src/main/java/org/bukkit/Registry.java
+++ b/src/main/java/org/bukkit/Registry.java
-@@ -199,14 +199,12 @@ public interface Registry extends Iterable {
+@@ -201,14 +201,12 @@ public interface Registry extends Iterable {
*
* @see TrimMaterial
*/
@@ -507,7 +471,7 @@ index db45423936d48835dee35d01ee502cdfdce4f68a..b3f8a2611ceb57f5d0b5c300fa80d8ba
Registry TRIM_PATTERN = Bukkit.getRegistry(TrimPattern.class);
/**
* Damage types.
-@@ -295,8 +293,11 @@ public interface Registry extends Iterable {
+@@ -310,8 +308,11 @@ public interface Registry extends Iterable {
*
* @param input non-null input
* @return registered object or null if does not exist
@@ -534,10 +498,10 @@ index 6277451c3c6c551078c237cd767b6d70c4f585ea..10f5cfb1885833a1d2c1027c03974da4
CRACKED(0x0),
GLYPHED(0x1),
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 050cdd5147814b39d158f0ce0fa8f5aa20894cf7..1f98a99eea0fb9a7ebef5d650640e7dac392416e 100644
+index 69f236d965c631510b008a7eb38aa1b62a4e196a..2382322bc4f30ff3163b2941650692d9a13328ac 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -728,9 +728,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -730,9 +730,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*
* @param id the id of the map to get
* @return a map view if it exists, or null otherwise
@@ -548,7 +512,7 @@ index 050cdd5147814b39d158f0ce0fa8f5aa20894cf7..1f98a99eea0fb9a7ebef5d650640e7da
@Nullable
public MapView getMap(int id);
-@@ -797,8 +796,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -799,8 +798,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* Returns the primary logger associated with this server instance.
*
* @return Logger associated with this server
@@ -563,7 +527,7 @@ index 050cdd5147814b39d158f0ce0fa8f5aa20894cf7..1f98a99eea0fb9a7ebef5d650640e7da
public Logger getLogger();
/**
-@@ -1127,10 +1132,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1137,10 +1142,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @param name the name the player to retrieve
* @return an offline player
* @see #getOfflinePlayer(java.util.UUID)
@@ -575,7 +539,7 @@ index 050cdd5147814b39d158f0ce0fa8f5aa20894cf7..1f98a99eea0fb9a7ebef5d650640e7da
@NotNull
public OfflinePlayer getOfflinePlayer(@NotNull String name);
-@@ -1630,7 +1633,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1649,7 +1652,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*
* @return the scoreboard manager or null if no worlds are loaded.
*/
@@ -628,7 +592,7 @@ index e455eb21abf121dc6ff10ff8a13dd06f67096a8f..bbc01e7c192ae6689c301670047ff114
return origin;
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 675dea2e1e9742043c18098774b9fde2e6f4602f..0023b9737353c3c7dcfb38a143761bd8c03acf0d 100644
+index b6ca63afb74b345e381d35646cc8faf52a2c7cbc..a523d1725f175c924ab1a7d544d389ec81b68bcf 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -418,9 +418,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -642,7 +606,7 @@ index 675dea2e1e9742043c18098774b9fde2e6f4602f..0023b9737353c3c7dcfb38a143761bd8
public boolean refreshChunk(int x, int z);
/**
-@@ -3754,6 +3753,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -3770,6 +3769,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
StructureSearchResult locateNearestStructure(@NotNull Location origin, @NotNull Structure structure, int radius, boolean findUnexplored);
// Spigot start
@@ -650,7 +614,7 @@ index 675dea2e1e9742043c18098774b9fde2e6f4602f..0023b9737353c3c7dcfb38a143761bd8
public class Spigot {
/**
-@@ -3787,7 +3787,11 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -3803,7 +3803,11 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
}
}
@@ -662,7 +626,7 @@ index 675dea2e1e9742043c18098774b9fde2e6f4602f..0023b9737353c3c7dcfb38a143761bd8
Spigot spigot();
// Spigot end
-@@ -4005,9 +4009,9 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4021,9 +4025,9 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
* Gets the dimension ID of this environment
*
* @return dimension ID
@@ -674,7 +638,7 @@ index 675dea2e1e9742043c18098774b9fde2e6f4602f..0023b9737353c3c7dcfb38a143761bd8
public int getId() {
return id;
}
-@@ -4017,9 +4021,9 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4033,9 +4037,9 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
*
* @param id The ID of the environment
* @return The environment
@@ -700,7 +664,7 @@ index a71001677e2b1b0b6225a7be63b8ea5ce4456862..c7ef0386a09a07a2317c56274ed41218
/**
* Returns if the given item is a preferred choice to break this Block.
diff --git a/src/main/java/org/bukkit/block/BlockState.java b/src/main/java/org/bukkit/block/BlockState.java
-index 7c5438fa92053cdbd7a01483a9baa4d48df07b24..a4f0a5270693e1c4af4fad827fa0a2ce753e07b5 100644
+index 3e07fc1bc0e08d0cfd998711c7fd547b2b7b6b73..fd4a9bdcfb6775dfbdb7492e6c9eb90722d2ecdc 100644
--- a/src/main/java/org/bukkit/block/BlockState.java
+++ b/src/main/java/org/bukkit/block/BlockState.java
@@ -36,8 +36,10 @@ public interface BlockState extends Metadatable {
@@ -714,7 +678,7 @@ index 7c5438fa92053cdbd7a01483a9baa4d48df07b24..a4f0a5270693e1c4af4fad827fa0a2ce
MaterialData getData();
/**
-@@ -141,7 +143,9 @@ public interface BlockState extends Metadatable {
+@@ -151,7 +153,9 @@ public interface BlockState extends Metadatable {
* Sets the metadata for this block state.
*
* @param data New block specific metadata
@@ -790,10 +754,10 @@ index 3afe2787de576f7190d87c796bea0ab34dc30248..58191017244f3949f6174fb108e3a245
/**
diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
-index e3f440c9d9ce3b5710ed1b7f71522899fb98459f..a4578c520aa1078a741aac4b12fe89bf82b3c465 100644
+index b975f11d342ca4357362de9aaae3f1af6716049e..c52e386ffa08abbbd38683792b281665cc98bd31 100644
--- a/src/main/java/org/bukkit/entity/EntityType.java
+++ b/src/main/java/org/bukkit/entity/EntityType.java
-@@ -397,9 +397,9 @@ public enum EntityType implements Keyed, Translatable {
+@@ -392,9 +392,9 @@ public enum EntityType implements Keyed, Translatable {
*
* @param name the entity type's name
* @return the matching entity type or null
@@ -848,7 +812,7 @@ index f124b35ec76e6cb6a1a0dc464005087043c3efd0..f50aaddf8582be55fd4860ad374d8f22
+@Deprecated(forRemoval = true) // Paper
public interface LingeringPotion extends ThrownPotion { }
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index d8ac9ce8e448f8b3bc39ec6c140db0e25d14cec7..2f9299f407692c51dca17ca38a6135dde259b895 100644
+index 8cd525dd8ded0ddbd405c66e9c0fbeb40f788521..a6bcdcbe47e17ebdd423bb0e1fb4e29eb9de01c4 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -716,7 +716,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -887,10 +851,10 @@ index 95c79c5fa0c4e30201f887da6467ce5f81c8a255..7f9c4d4b430a3f0276461346ff2621ba
/**
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 5e17bab05276de4340c5f06866f2efce81a9ab65..8f2a6f8ac70a7d5c2b8f9c17199b6eb88750a703 100644
+index 92a83edc03fa8d11f026ac312b989329fa6a7e88..33547e9e3f8f7c906a5d91b75eb62327cc1f2a3a 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1591,11 +1591,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1635,11 +1635,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
/**
* Forces an update of the player's entire inventory.
@@ -939,32 +903,6 @@ index 9cb08fe7201a9f91e88c7b1ee22c17889a7bf1c3..c0fcfccdf476106b48e626a099658c04
-@Deprecated
+@Deprecated(forRemoval = true) // Paper
public interface SplashPotion extends ThrownPotion { }
-diff --git a/src/main/java/org/bukkit/entity/TextDisplay.java b/src/main/java/org/bukkit/entity/TextDisplay.java
-index f101ffde9e7b3f6c3ab6f1cffb8d6f4e720634b2..8abc129f5953807e7a451166dabcf3e14e55483f 100644
---- a/src/main/java/org/bukkit/entity/TextDisplay.java
-+++ b/src/main/java/org/bukkit/entity/TextDisplay.java
-@@ -62,19 +62,17 @@ public interface TextDisplay extends Display {
- * Gets the text background color.
- *
- * @return the background color
-- * @deprecated API subject to change
- */
- @Nullable
-- @Deprecated
-+ // @Deprecated // Paper - is stable API
- Color getBackgroundColor();
-
- /**
- * Sets the text background color.
- *
- * @param color new background color
-- * @deprecated API subject to change
- */
-- @Deprecated
-+ // @Deprecated // Paper - is stable API
- void setBackgroundColor(@Nullable Color color);
-
- /**
diff --git a/src/main/java/org/bukkit/entity/memory/MemoryKey.java b/src/main/java/org/bukkit/entity/memory/MemoryKey.java
index 8f601e85df580ef8106eaff8b9eafb5691a4874b..d615c006c9153fb65024241604b744fbfc383efc 100644
--- a/src/main/java/org/bukkit/entity/memory/MemoryKey.java
@@ -1642,41 +1580,37 @@ index 597a18a767b68b47e81454b7d44613c7178c1366..bc3440eb72127824b3961fbdae583bb6
public ItemStack getInput() {
return this.ingredient.getItemStack();
diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index f800e776329c1b42f834cb30ebf2d0ace195d1a2..f23c0c942f200a68d2620f225ab90399a9057dfc 100644
+index de38d9b667e04852c7bdccfa17cbabb1512f4c19..348ad8932fc55830f83ccc60d5cc4aaf8a29d164 100644
--- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-@@ -75,8 +75,10 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -111,6 +111,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
/**
* Checks for existence of a localized name.
*
+ * @deprecated Use {@link ItemMeta#displayName()} and check if it is instanceof a {@link net.kyori.adventure.text.TranslatableComponent}.
* @return true if this has a localized name
+ * @deprecated meta no longer exists
*/
-+ @Deprecated // Paper - Deprecate old localized API
- boolean hasLocalizedName();
-
- /**
-@@ -85,16 +87,20 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -123,9 +124,11 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
* Plugins should check that hasLocalizedName() returns true
* before calling this method.
*
+ * @deprecated Use {@link ItemMeta#displayName()} and cast it to a {@link net.kyori.adventure.text.TranslatableComponent}. No longer used by the client.
* @return the localized name that is set
+ * @deprecated meta no longer exists
*/
+ @Deprecated // Paper - Deprecate old localized API
@NotNull
+ @Deprecated(forRemoval = true)
String getLocalizedName();
-
+@@ -133,6 +136,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
/**
* Sets the localized name.
*
+ * @deprecated Use {@link ItemMeta#displayName(Component)} with a {@link net.kyori.adventure.text.TranslatableComponent}. No longer used by the client.
* @param name the name to set
+ * @deprecated meta no longer exists
*/
-+ @Deprecated // Paper - Deprecate old localized API
- void setLocalizedName(@Nullable String name);
-
- /**
diff --git a/src/main/java/org/bukkit/inventory/meta/MapMeta.java b/src/main/java/org/bukkit/inventory/meta/MapMeta.java
index 32055a8890425e0b819930f3059da5ea9dfca553..26a336dade83baee97d20eb39a058925659f5777 100644
--- a/src/main/java/org/bukkit/inventory/meta/MapMeta.java
@@ -1740,10 +1674,10 @@ index 00437719722830c087ff925015086c29bbb04497..ae9bcc8262dbf6eb8673ca82395d0916
/**
diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java
-index 7d4f4970dae6fe4eeea6b6b6810dcecfe20d6e51..599399e4d8ca7c46747439ad2dd0186d0a289a19 100644
+index f9803c7483f7458fed1f22ddfda6e7ef03cfc688..9abea12cb949f7ffa1b72aabf2a3c059b64f3557 100644
--- a/src/main/java/org/bukkit/map/MapCursor.java
+++ b/src/main/java/org/bukkit/map/MapCursor.java
-@@ -156,9 +156,9 @@ public final class MapCursor {
+@@ -158,9 +158,9 @@ public final class MapCursor {
* Get the type of this cursor.
*
* @return The type (color/style) of the map cursor.
@@ -1755,7 +1689,7 @@ index 7d4f4970dae6fe4eeea6b6b6810dcecfe20d6e51..599399e4d8ca7c46747439ad2dd0186d
public byte getRawType() {
return type;
}
-@@ -215,9 +215,9 @@ public final class MapCursor {
+@@ -217,9 +217,9 @@ public final class MapCursor {
* Set the type of this cursor.
*
* @param type The type (color/style) of the map cursor.
@@ -1767,7 +1701,7 @@ index 7d4f4970dae6fe4eeea6b6b6810dcecfe20d6e51..599399e4d8ca7c46747439ad2dd0186d
public void setRawType(byte type) {
if (type < 0 || type > 26) {
throw new IllegalArgumentException("Type must be in the range 0-26");
-@@ -328,9 +328,9 @@ public final class MapCursor {
+@@ -339,9 +339,9 @@ public final class MapCursor {
* Gets the internal value of the cursor.
*
* @return the value
@@ -1779,7 +1713,7 @@ index 7d4f4970dae6fe4eeea6b6b6810dcecfe20d6e51..599399e4d8ca7c46747439ad2dd0186d
public byte getValue() {
return value;
}
-@@ -340,9 +340,9 @@ public final class MapCursor {
+@@ -351,9 +351,9 @@ public final class MapCursor {
*
* @param value the value
* @return the matching type
@@ -1933,10 +1867,10 @@ index 0ea9c6b2420a0f990bd1fdf50fc015e37a7060d8..e99644eae1c662b117aa19060d2484ac
/**
diff --git a/src/main/java/org/bukkit/potion/PotionEffectType.java b/src/main/java/org/bukkit/potion/PotionEffectType.java
-index 28dd05c706211f78eb27329a4284e2f21c5f5eb5..f97dff2fd90cc8c35cbde04d1ace81320a8e4658 100644
+index 7feeb33f8938be968b20c19437723d8c968690fa..e045e6a74821f291938cc6af86e313c1f1c4626c 100644
--- a/src/main/java/org/bukkit/potion/PotionEffectType.java
+++ b/src/main/java/org/bukkit/potion/PotionEffectType.java
-@@ -240,9 +240,9 @@ public abstract class PotionEffectType implements Keyed, Translatable {
+@@ -270,9 +270,9 @@ public abstract class PotionEffectType implements Keyed, Translatable {
* Returns the unique ID of this type.
*
* @return Unique ID
@@ -1948,7 +1882,7 @@ index 28dd05c706211f78eb27329a4284e2f21c5f5eb5..f97dff2fd90cc8c35cbde04d1ace8132
public abstract int getId();
/**
-@@ -278,9 +278,9 @@ public abstract class PotionEffectType implements Keyed, Translatable {
+@@ -308,9 +308,9 @@ public abstract class PotionEffectType implements Keyed, Translatable {
*
* @param id Unique ID to fetch
* @return Resulting type, or null if not found.
diff --git a/patches/api/0176-Add-Heightmap-API.patch b/patches/api/0176-Add-Heightmap-API.patch
index bfa338c360..9c0ab69035 100644
--- a/patches/api/0176-Add-Heightmap-API.patch
+++ b/patches/api/0176-Add-Heightmap-API.patch
@@ -102,7 +102,7 @@ index f0878c7539696cc0676e6010e88914d3850acf20..c6049747fc286acb4e8053901fcc517e
/**
* Creates explosion at this location with given power
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 0023b9737353c3c7dcfb38a143761bd8c03acf0d..0a7c97aa289687cfbf6ae1a222f5eb2850f8f43e 100644
+index a523d1725f175c924ab1a7d544d389ec81b68bcf..77314fdbd99a5cc34e7a1df4692ba8a1685ef002 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -153,6 +153,87 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0181-Expose-the-internal-current-tick.patch b/patches/api/0181-Expose-the-internal-current-tick.patch
index 4db7cb0ddf..7cd95c46f8 100644
--- a/patches/api/0181-Expose-the-internal-current-tick.patch
+++ b/patches/api/0181-Expose-the-internal-current-tick.patch
@@ -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 4716b9a9ebaf3deb0a262d4ea1da492547be4913..999f72af999a95642b5865144d1da9bd9f86aaee 100644
+index 395d7245aac45a1b805e15ee1fdb9949574f3f59..d1e1c49ecf6a1ede71548fbac6143e38ba6dfea1 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2475,6 +2475,10 @@ public final class Bukkit {
+@@ -2498,6 +2498,10 @@ public final class Bukkit {
public static com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name) {
return server.createProfileExact(uuid, name);
}
@@ -20,10 +20,10 @@ index 4716b9a9ebaf3deb0a262d4ea1da492547be4913..999f72af999a95642b5865144d1da9bd
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 1f98a99eea0fb9a7ebef5d650640e7dac392416e..8445a62af2ca5dd47b4905d75b31d9d6ea0623ea 100644
+index 2382322bc4f30ff3163b2941650692d9a13328ac..cf242e2e6d538d3d38b7b10321ab375e018b24b1 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -2155,5 +2155,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2174,5 +2174,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name);
diff --git a/patches/api/0185-Entity-Jump-API.patch b/patches/api/0185-Entity-Jump-API.patch
index 8d8898f3c1..86c29fafdc 100644
--- a/patches/api/0185-Entity-Jump-API.patch
+++ b/patches/api/0185-Entity-Jump-API.patch
@@ -61,10 +61,10 @@ index 0000000000000000000000000000000000000000..a6306c957fcacdcbcc8037b4ee33a167
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 2f9299f407692c51dca17ca38a6135dde259b895..1a7d802e8c3204408402ce58377108ffac2662b9 100644
+index a6bcdcbe47e17ebdd423bb0e1fb4e29eb9de01c4..90466c457657e15796b81ebe50ae873aa9f1774b 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1147,4 +1147,26 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1149,4 +1149,26 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
return this.getActiveItemHand();
}
// Paper end - active item API
diff --git a/patches/api/0187-Add-tick-times-API.patch b/patches/api/0187-Add-tick-times-API.patch
index 350b7fda96..40cbc279eb 100644
--- a/patches/api/0187-Add-tick-times-API.patch
+++ b/patches/api/0187-Add-tick-times-API.patch
@@ -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 999f72af999a95642b5865144d1da9bd9f86aaee..10aea8b80b49a6c47b04de4d3f33eb786f08651b 100644
+index d1e1c49ecf6a1ede71548fbac6143e38ba6dfea1..385be33869f3850f8b1d3e690c8e0fc43adcbdce 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2147,6 +2147,25 @@ public final class Bukkit {
+@@ -2170,6 +2170,25 @@ public final class Bukkit {
public static double[] getTPS() {
return server.getTPS();
}
@@ -35,10 +35,10 @@ index 999f72af999a95642b5865144d1da9bd9f86aaee..10aea8b80b49a6c47b04de4d3f33eb78
/**
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8445a62af2ca5dd47b4905d75b31d9d6ea0623ea..4b3fadfc90299cc717d85cb9856662e2b3230872 100644
+index cf242e2e6d538d3d38b7b10321ab375e018b24b1..d6d83b22389aee98967adda2631fa65ecbf00781 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -1817,6 +1817,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1836,6 +1836,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
public double[] getTPS();
diff --git a/patches/api/0188-Expose-MinecraftServer-isRunning.patch b/patches/api/0188-Expose-MinecraftServer-isRunning.patch
index 7800f62ac6..0f50363b31 100644
--- a/patches/api/0188-Expose-MinecraftServer-isRunning.patch
+++ b/patches/api/0188-Expose-MinecraftServer-isRunning.patch
@@ -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 10aea8b80b49a6c47b04de4d3f33eb786f08651b..803ca460cf91f6760d7b16e1310a23d6b09725b3 100644
+index 385be33869f3850f8b1d3e690c8e0fc43adcbdce..f24d57a89dc4fdf73298bbb4cc187794c7bd6706 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2498,6 +2498,15 @@ public final class Bukkit {
+@@ -2521,6 +2521,15 @@ public final class Bukkit {
public static int getCurrentTick() {
return server.getCurrentTick();
}
@@ -26,10 +26,10 @@ index 10aea8b80b49a6c47b04de4d3f33eb786f08651b..803ca460cf91f6760d7b16e1310a23d6
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 4b3fadfc90299cc717d85cb9856662e2b3230872..1575218ee7eb563b17b542b578c10d125889a7be 100644
+index d6d83b22389aee98967adda2631fa65ecbf00781..015f1167bdc752fe6665807866caa0cda5ba0571 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -2177,5 +2177,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2196,5 +2196,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return Current tick
*/
int getCurrentTick();
diff --git a/patches/api/0190-Add-Player-Client-Options-API.patch b/patches/api/0190-Add-Player-Client-Options-API.patch
index 988d0832be..e4057fe25a 100644
--- a/patches/api/0190-Add-Player-Client-Options-API.patch
+++ b/patches/api/0190-Add-Player-Client-Options-API.patch
@@ -231,10 +231,10 @@ index 0000000000000000000000000000000000000000..1757055d821d9ec7c728aa6c1b52fa6a
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8f2a6f8ac70a7d5c2b8f9c17199b6eb88750a703..962cfd7b81a38e8e0bf4371d7c3aca80f40636af 100644
+index 33547e9e3f8f7c906a5d91b75eb62327cc1f2a3a..7429666fd1af4f4a924cf93572df5b826782af05 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3238,6 +3238,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3282,6 +3282,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
void resetCooldown();
// Paper end - attack cooldown API
diff --git a/patches/api/0193-Add-item-slot-convenience-methods.patch b/patches/api/0192-Add-item-slot-convenience-methods.patch
similarity index 100%
rename from patches/api/0193-Add-item-slot-convenience-methods.patch
rename to patches/api/0192-Add-item-slot-convenience-methods.patch
diff --git a/patches/api/0192-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/patches/api/0192-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
deleted file mode 100644
index 2fa02a7788..0000000000
--- a/patches/api/0192-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Wesley Smith
-Date: Fri, 24 Apr 2020 18:30:26 -0400
-Subject: [PATCH] Fix Potion#toItemStack swapping the extended and upgraded
- constructor values.
-
-While the Potion class is deprecated, it is still used in some plugins for cross-version potion handling. This issue has existed for a long time, and has caused many heaches along the way.
-
-diff --git a/src/main/java/org/bukkit/potion/Potion.java b/src/main/java/org/bukkit/potion/Potion.java
-index 266547c6da0e3270af5c9ca81268934294a7c48d..69e7ce61090e3e3a7a337a96b380c8ffe78ffb8d 100644
---- a/src/main/java/org/bukkit/potion/Potion.java
-+++ b/src/main/java/org/bukkit/potion/Potion.java
-@@ -267,7 +267,7 @@ public class Potion {
- }
- ItemStack itemStack = new ItemStack(material, amount);
- PotionMeta meta = (PotionMeta) itemStack.getItemMeta();
-- meta.setBasePotionData(new PotionData(type, level == 2, extended));
-+ meta.setBasePotionData(new PotionData(type, extended, level == 2)); // Paper - fix swapped values
- itemStack.setItemMeta(meta);
- return itemStack;
- }
diff --git a/patches/api/0194-Villager-Restocks-API.patch b/patches/api/0193-Villager-Restocks-API.patch
similarity index 100%
rename from patches/api/0194-Villager-Restocks-API.patch
rename to patches/api/0193-Villager-Restocks-API.patch
diff --git a/patches/api/0195-Expose-game-version.patch b/patches/api/0194-Expose-game-version.patch
similarity index 83%
rename from patches/api/0195-Expose-game-version.patch
rename to patches/api/0194-Expose-game-version.patch
index 698a089e9a..785d8563d2 100644
--- a/patches/api/0195-Expose-game-version.patch
+++ b/patches/api/0194-Expose-game-version.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose game version
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 803ca460cf91f6760d7b16e1310a23d6b09725b3..377e9979c5bbc50398d521ff038956f80d7376b1 100644
+index f24d57a89dc4fdf73298bbb4cc187794c7bd6706..b608a6dc26bfc6d08f1e31107fed8ef1aaf90e1d 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -159,6 +159,18 @@ public final class Bukkit {
+@@ -161,6 +161,18 @@ public final class Bukkit {
return server.getBukkitVersion();
}
@@ -28,10 +28,10 @@ index 803ca460cf91f6760d7b16e1310a23d6b09725b3..377e9979c5bbc50398d521ff038956f8
* Gets a view of all currently logged in players. This {@linkplain
* Collections#unmodifiableCollection(Collection) view} is a reused
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 1575218ee7eb563b17b542b578c10d125889a7be..7ed98561c6320132501c89d70254870e6ec03e77 100644
+index 015f1167bdc752fe6665807866caa0cda5ba0571..987e01f48f7f8b19fd6292a11988b1aeb90a09f6 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -117,6 +117,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -119,6 +119,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
public String getBukkitVersion();
diff --git a/patches/api/0196-Add-Mob-Goal-API.patch b/patches/api/0195-Add-Mob-Goal-API.patch
similarity index 96%
rename from patches/api/0196-Add-Mob-Goal-API.patch
rename to patches/api/0195-Add-Mob-Goal-API.patch
index 4b35a66541..102b780fac 100644
--- a/patches/api/0196-Add-Mob-Goal-API.patch
+++ b/patches/api/0195-Add-Mob-Goal-API.patch
@@ -226,10 +226,10 @@ index 0000000000000000000000000000000000000000..e21f7574763dd4f13794f91bbef192ef
+ Collection> getRunningGoalsWithout(@NotNull T mob, @NotNull GoalType type);
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 377e9979c5bbc50398d521ff038956f80d7376b1..9e14744feb0c5ad0b8df1bcbaf19d75327ad2148 100644
+index b608a6dc26bfc6d08f1e31107fed8ef1aaf90e1d..79db7b5c25a7c824b107a5c79f40c61983d2757c 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2519,6 +2519,16 @@ public final class Bukkit {
+@@ -2542,6 +2542,16 @@ public final class Bukkit {
public static boolean isStopping() {
return server.isStopping();
}
@@ -247,10 +247,10 @@ index 377e9979c5bbc50398d521ff038956f80d7376b1..9e14744feb0c5ad0b8df1bcbaf19d753
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7ed98561c6320132501c89d70254870e6ec03e77..1fda10dcabdcfe0cd51c3532576bddeb4fa877b8 100644
+index 987e01f48f7f8b19fd6292a11988b1aeb90a09f6..8aba385b9d1a9b71c3304f1d802f18d4434f34d5 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -2194,5 +2194,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2213,5 +2213,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return true if server is in the process of being shutdown
*/
boolean isStopping();
diff --git a/patches/api/0197-Add-villager-reputation-API.patch b/patches/api/0196-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/api/0197-Add-villager-reputation-API.patch
rename to patches/api/0196-Add-villager-reputation-API.patch
diff --git a/patches/api/0198-Spawn-Reason-API.patch b/patches/api/0197-Spawn-Reason-API.patch
similarity index 100%
rename from patches/api/0198-Spawn-Reason-API.patch
rename to patches/api/0197-Spawn-Reason-API.patch
diff --git a/patches/api/0199-Potential-bed-API.patch b/patches/api/0198-Potential-bed-API.patch
similarity index 100%
rename from patches/api/0199-Potential-bed-API.patch
rename to patches/api/0198-Potential-bed-API.patch
diff --git a/patches/api/0200-Inventory-getHolder-method-without-block-snapshot.patch b/patches/api/0199-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/api/0200-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/api/0199-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/api/0201-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/api/0200-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from patches/api/0201-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/api/0200-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/api/0202-Support-components-in-ItemMeta.patch b/patches/api/0201-Support-components-in-ItemMeta.patch
similarity index 87%
rename from patches/api/0202-Support-components-in-ItemMeta.patch
rename to patches/api/0201-Support-components-in-ItemMeta.patch
index dc804cc5b2..e3707f1e60 100644
--- a/patches/api/0202-Support-components-in-ItemMeta.patch
+++ b/patches/api/0201-Support-components-in-ItemMeta.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Support components in ItemMeta
diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index f23c0c942f200a68d2620f225ab90399a9057dfc..478b6d2acbc5788f72db81f387daa08df7837a5d 100644
+index 348ad8932fc55830f83ccc60d5cc4aaf8a29d164..b039fc170c0760f15fa0f9220da2032a23e5c455 100644
--- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
@@ -5,6 +5,7 @@ import java.util.Collection;
@@ -16,7 +16,7 @@ index f23c0c942f200a68d2620f225ab90399a9057dfc..478b6d2acbc5788f72db81f387daa08d
import org.bukkit.attribute.Attribute;
import org.bukkit.attribute.AttributeModifier;
import org.bukkit.configuration.serialization.ConfigurationSerializable;
-@@ -63,6 +64,20 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -65,6 +66,20 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
@NotNull
String getDisplayName();
@@ -37,7 +37,7 @@ index f23c0c942f200a68d2620f225ab90399a9057dfc..478b6d2acbc5788f72db81f387daa08d
/**
* Sets the display name.
*
-@@ -72,6 +87,16 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -74,6 +89,16 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
@Deprecated // Paper
void setDisplayName(@Nullable String name);
@@ -52,9 +52,9 @@ index f23c0c942f200a68d2620f225ab90399a9057dfc..478b6d2acbc5788f72db81f387daa08d
+ void setDisplayNameComponent(@Nullable net.md_5.bungee.api.chat.BaseComponent[] component);
+ // Paper end
/**
- * Checks for existence of a localized name.
- *
-@@ -141,6 +166,19 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+ * Checks for existence of an item name.
+ *
+@@ -181,6 +206,19 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
@Nullable
List getLore();
@@ -74,7 +74,7 @@ index f23c0c942f200a68d2620f225ab90399a9057dfc..478b6d2acbc5788f72db81f387daa08d
/**
* Sets the lore for this item.
* Removes lore when given null.
-@@ -151,6 +189,16 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+@@ -191,6 +229,16 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
@Deprecated // Paper
void setLore(@Nullable List lore);
diff --git a/patches/api/0203-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/api/0202-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
similarity index 100%
rename from patches/api/0203-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
rename to patches/api/0202-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
diff --git a/patches/api/0204-Add-entity-liquid-API.patch b/patches/api/0203-Add-entity-liquid-API.patch
similarity index 88%
rename from patches/api/0204-Add-entity-liquid-API.patch
rename to patches/api/0203-Add-entity-liquid-API.patch
index f1e3bccd46..a1ac30dc85 100644
--- a/patches/api/0204-Add-entity-liquid-API.patch
+++ b/patches/api/0203-Add-entity-liquid-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add entity liquid API
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 11a77f977c6abc031cf5a4d58924bc7af5e7ea53..3deccdf110c2cb74444b5d715082fbbdaa8f20ce 100644
+index 66716da0b475524917d4153e481100b795ea11a9..6a9cd00110988a0d0bd89f0252cc0f21c36982c0 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -848,5 +848,40 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -859,5 +859,40 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
@NotNull
org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason();
diff --git a/patches/api/0205-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/api/0204-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
similarity index 100%
rename from patches/api/0205-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
rename to patches/api/0204-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
diff --git a/patches/api/0206-Add-BellRingEvent.patch b/patches/api/0205-Add-BellRingEvent.patch
similarity index 100%
rename from patches/api/0206-Add-BellRingEvent.patch
rename to patches/api/0205-Add-BellRingEvent.patch
diff --git a/patches/api/0207-Brand-support.patch b/patches/api/0206-Brand-support.patch
similarity index 85%
rename from patches/api/0207-Brand-support.patch
rename to patches/api/0206-Brand-support.patch
index 9b1680d885..31a2278550 100644
--- a/patches/api/0207-Brand-support.patch
+++ b/patches/api/0206-Brand-support.patch
@@ -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 962cfd7b81a38e8e0bf4371d7c3aca80f40636af..219a819731ec081fea4fe3ac75e617f8cd6afbbf 100644
+index 7429666fd1af4f4a924cf93572df5b826782af05..b0c0fd6687af5676d85094304ced25c1c444bc90 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3351,6 +3351,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3395,6 +3395,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
// Paper end
}
diff --git a/patches/api/0208-Add-moon-phase-API.patch b/patches/api/0207-Add-moon-phase-API.patch
similarity index 100%
rename from patches/api/0208-Add-moon-phase-API.patch
rename to patches/api/0207-Add-moon-phase-API.patch
diff --git a/patches/api/0209-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0208-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 89%
rename from patches/api/0209-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/api/0208-Add-playPickupItemAnimation-to-LivingEntity.patch
index e862e67086..19b048763f 100644
--- a/patches/api/0209-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/api/0208-Add-playPickupItemAnimation-to-LivingEntity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 1a7d802e8c3204408402ce58377108ffac2662b9..7dbb3737cd175365b89a5c8d0542b16e812b8629 100644
+index 90466c457657e15796b81ebe50ae873aa9f1774b..79ef7733ba6fd7d34f8bf87218779af5ba74d084 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1169,4 +1169,29 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1171,4 +1171,29 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*/
void setJumping(boolean jumping);
// Paper end - entity jump API
diff --git a/patches/api/0210-Add-more-Evoker-API.patch b/patches/api/0209-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/api/0210-Add-more-Evoker-API.patch
rename to patches/api/0209-Add-more-Evoker-API.patch
diff --git a/patches/api/0211-Add-methods-to-get-translation-keys.patch b/patches/api/0210-Add-methods-to-get-translation-keys.patch
similarity index 94%
rename from patches/api/0211-Add-methods-to-get-translation-keys.patch
rename to patches/api/0210-Add-methods-to-get-translation-keys.patch
index 4208d897a6..72c9ae1cbf 100644
--- a/patches/api/0211-Add-methods-to-get-translation-keys.patch
+++ b/patches/api/0210-Add-methods-to-get-translation-keys.patch
@@ -119,7 +119,7 @@ index 81e45984a88fc84acd0f76d825abf4ddaed0ac3b..fdc42a79c5af30fdade41ee99245e664
/**
diff --git a/src/main/java/org/bukkit/GameRule.java b/src/main/java/org/bukkit/GameRule.java
-index cca5267019052f77149f9913babd8b17abafe94f..be827e7fef0acb17bd41aeff9dc3dc4da3718e5e 100644
+index dc66bd69646ac949d1386ce8f6ff913e9475439d..4482e8f2c617c2f51b2b53762e775d118002363a 100644
--- a/src/main/java/org/bukkit/GameRule.java
+++ b/src/main/java/org/bukkit/GameRule.java
@@ -15,7 +15,7 @@ import org.jetbrains.annotations.Nullable;
@@ -131,7 +131,7 @@ index cca5267019052f77149f9913babd8b17abafe94f..be827e7fef0acb17bd41aeff9dc3dc4d
private static Map> gameRules = new HashMap<>();
// Boolean rules
-@@ -350,4 +350,11 @@ public final class GameRule {
+@@ -355,4 +355,11 @@ public final class GameRule {
public static GameRule[] values() {
return gameRules.values().toArray(new GameRule[gameRules.size()]);
}
@@ -144,10 +144,10 @@ index cca5267019052f77149f9913babd8b17abafe94f..be827e7fef0acb17bd41aeff9dc3dc4d
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index c24fe19600fa8440c130eaea247d5874da3873ec..af1dca2385215e8fd19353aa6e9c024d4ad814e1 100644
+index 76c96e1a82366aafa0148a1260500a38cea12f37..6551bb9409f9714033532b5cfe9219ed84e438f2 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
-@@ -122,7 +122,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -123,7 +123,7 @@ import org.jetbrains.annotations.Nullable;
* An enum of all material IDs accepted by the official server and client
*/
@SuppressWarnings({"DeprecatedIsStillUsed", "deprecation"}) // Paper
@@ -156,7 +156,7 @@ index c24fe19600fa8440c130eaea247d5874da3873ec..af1dca2385215e8fd19353aa6e9c024d
//
AIR(9648, 0),
STONE(22948),
-@@ -4699,6 +4699,15 @@ public enum Material implements Keyed, Translatable {
+@@ -4737,6 +4737,15 @@ public enum Material implements Keyed, Translatable {
}
return false;
}
@@ -172,7 +172,7 @@ index c24fe19600fa8440c130eaea247d5874da3873ec..af1dca2385215e8fd19353aa6e9c024d
// Paper end
/**
-@@ -11402,9 +11411,11 @@ public enum Material implements Keyed, Translatable {
+@@ -11473,9 +11482,11 @@ public enum Material implements Keyed, Translatable {
* material
* @see #getBlockTranslationKey()
* @see #getItemTranslationKey()
@@ -185,7 +185,7 @@ index c24fe19600fa8440c130eaea247d5874da3873ec..af1dca2385215e8fd19353aa6e9c024d
if (this.isItem()) {
return Bukkit.getUnsafe().getItemTranslationKey(this);
diff --git a/src/main/java/org/bukkit/MusicInstrument.java b/src/main/java/org/bukkit/MusicInstrument.java
-index a7573ce8c6dff9862c97ce74650284b4a42e7989..ee5368372e136541eafe1d7ffb395de670fe4843 100644
+index eae90e72b1dff5ab3b1a4fdcfe57187e85fe4d49..62d2b3f950860dee0898d77b0a29635c3f9a7e23 100644
--- a/src/main/java/org/bukkit/MusicInstrument.java
+++ b/src/main/java/org/bukkit/MusicInstrument.java
@@ -7,7 +7,7 @@ import java.util.Collections;
@@ -195,8 +195,8 @@ index a7573ce8c6dff9862c97ce74650284b4a42e7989..ee5368372e136541eafe1d7ffb395de6
-public abstract class MusicInstrument implements Keyed {
+public abstract class MusicInstrument implements Keyed, net.kyori.adventure.translation.Translatable { // Paper - translation keys
- public static final MusicInstrument PONDER = getInstrument("ponder_goat_horn");
- public static final MusicInstrument SING = getInstrument("sing_goat_horn");
+ public static final MusicInstrument PONDER_GOAT_HORN = getInstrument("ponder_goat_horn");
+ public static final MusicInstrument SING_GOAT_HORN = getInstrument("sing_goat_horn");
@@ -52,4 +52,11 @@ public abstract class MusicInstrument implements Keyed {
return instrument;
@@ -233,7 +233,7 @@ index e3faa2c675c85a9cbdbbb1debec0ff81c58a1bbd..fd1629c2d2028a88fb3d56b0aeb833d1
String getTranslationKey();
}
diff --git a/src/main/java/org/bukkit/attribute/Attribute.java b/src/main/java/org/bukkit/attribute/Attribute.java
-index 7d5e6961e7e836f57cb7114ae7cef9dbd95ad0a1..66027c2ea32d44a5d2df18d6414668d847f6fd9c 100644
+index 3a7f6fd862dc2dd72366089ce99a0e96d07c0fdc..063cb21e33d039933e9ef295564db595cfd9f8c9 100644
--- a/src/main/java/org/bukkit/attribute/Attribute.java
+++ b/src/main/java/org/bukkit/attribute/Attribute.java
@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
@@ -245,7 +245,7 @@ index 7d5e6961e7e836f57cb7114ae7cef9dbd95ad0a1..66027c2ea32d44a5d2df18d6414668d8
/**
* Maximum health of an Entity.
-@@ -85,4 +85,12 @@ public enum Attribute implements Keyed, Translatable {
+@@ -117,4 +117,12 @@ public enum Attribute implements Keyed, Translatable {
public String getTranslationKey() {
return Bukkit.getUnsafe().getTranslationKey(this);
}
@@ -310,10 +310,10 @@ index bf29d9b733afc7c62725d259f4920c4f211cc6d0..1d3812db989a55b6f31bb30dffe70323
// Paper end
}
diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java
-index 350d52f4dd97a7e6a6a9a967e1c6a8781feda22e..13f25ff4a4dd5a98f5f690c54e5cba6ef145c2d0 100644
+index dddd0e74962d5713c4bb6219fba48aae5763e9ea..5b831dc9666b68fd9f4497aa3b07beba13fb215f 100644
--- a/src/main/java/org/bukkit/enchantments/Enchantment.java
+++ b/src/main/java/org/bukkit/enchantments/Enchantment.java
-@@ -14,7 +14,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -15,7 +15,7 @@ import org.jetbrains.annotations.Nullable;
/**
* The various type of enchantments that may be added to armour or weapons
*/
@@ -338,7 +338,7 @@ index c4f86ba1037f3f0e5d697a0962d71d6f8c7c1fbe..ac0371285370594d4de1554871b19bbc
// Paper end
}
diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
-index a4578c520aa1078a741aac4b12fe89bf82b3c465..550d66e0d41878717c6a92caade4a8413674f012 100644
+index c52e386ffa08abbbd38683792b281665cc98bd31..4ff2f0b70a89b3d1fb3f588d014e09b3cf8ed16f 100644
--- a/src/main/java/org/bukkit/entity/EntityType.java
+++ b/src/main/java/org/bukkit/entity/EntityType.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.Contract;
@@ -350,7 +350,7 @@ index a4578c520aa1078a741aac4b12fe89bf82b3c465..550d66e0d41878717c6a92caade4a841
// These strings MUST match the strings in nms.EntityTypes and are case sensitive.
/**
-@@ -443,10 +443,22 @@ public enum EntityType implements Keyed, Translatable {
+@@ -438,10 +438,22 @@ public enum EntityType implements Keyed, Translatable {
@Override
@NotNull
diff --git a/patches/api/0212-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/api/0211-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/api/0212-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/api/0211-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/api/0213-Add-additional-open-container-api-to-HumanEntity.patch b/patches/api/0212-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/api/0213-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/api/0212-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/api/0214-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/api/0213-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/api/0214-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/api/0213-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/api/0215-Entity-isTicking.patch b/patches/api/0214-Entity-isTicking.patch
similarity index 79%
rename from patches/api/0215-Entity-isTicking.patch
rename to patches/api/0214-Entity-isTicking.patch
index 778cc4b6a6..37d0f8dce3 100644
--- a/patches/api/0215-Entity-isTicking.patch
+++ b/patches/api/0214-Entity-isTicking.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity#isTicking
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 3deccdf110c2cb74444b5d715082fbbdaa8f20ce..9711a8077238383f23fb7aa2c20b2c089776e3f8 100644
+index 6a9cd00110988a0d0bd89f0252cc0f21c36982c0..e9c3c5c4099f7bf7f83bde0b47fd193a3b401f0a 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -883,5 +883,10 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -894,5 +894,10 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
* Check if entity is in lava
*/
boolean isInLava();
diff --git a/patches/api/0216-Villager-resetOffers.patch b/patches/api/0215-Villager-resetOffers.patch
similarity index 100%
rename from patches/api/0216-Villager-resetOffers.patch
rename to patches/api/0215-Villager-resetOffers.patch
diff --git a/patches/api/0217-Player-elytra-boost-API.patch b/patches/api/0216-Player-elytra-boost-API.patch
similarity index 91%
rename from patches/api/0217-Player-elytra-boost-API.patch
rename to patches/api/0216-Player-elytra-boost-API.patch
index 62287ccf59..29d5923494 100644
--- a/patches/api/0217-Player-elytra-boost-API.patch
+++ b/patches/api/0216-Player-elytra-boost-API.patch
@@ -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 219a819731ec081fea4fe3ac75e617f8cd6afbbf..f52f35902cc6a8af5ee60cf815caef7a43372158 100644
+index b0c0fd6687af5676d85094304ced25c1c444bc90..28a811be93b29f105dad1db91a8adccbdf9fcaf7 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3245,6 +3245,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3289,6 +3289,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@NotNull T getClientOption(com.destroystokyo.paper.@NotNull ClientOption option);
// Paper end - client option API
diff --git a/patches/api/0218-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0217-Add-getOfflinePlayerIfCached-String.patch
similarity index 88%
rename from patches/api/0218-Add-getOfflinePlayerIfCached-String.patch
rename to patches/api/0217-Add-getOfflinePlayerIfCached-String.patch
index 2e8d4ad4b3..402eff8c38 100644
--- a/patches/api/0218-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/api/0217-Add-getOfflinePlayerIfCached-String.patch
@@ -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 9e14744feb0c5ad0b8df1bcbaf19d75327ad2148..e832c6a8a10bc29d9ab20cbdf394cf836eb2f6a5 100644
+index 79db7b5c25a7c824b107a5c79f40c61983d2757c..732ed3724e784ad659cb4411dbd73b42a8330a2c 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1361,6 +1361,27 @@ public final class Bukkit {
+@@ -1373,6 +1373,27 @@ public final class Bukkit {
return server.getOfflinePlayer(name);
}
@@ -37,10 +37,10 @@ index 9e14744feb0c5ad0b8df1bcbaf19d75327ad2148..e832c6a8a10bc29d9ab20cbdf394cf83
* 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 1fda10dcabdcfe0cd51c3532576bddeb4fa877b8..9477563308adc64fff065eb0a50654baa0d22b84 100644
+index 8aba385b9d1a9b71c3304f1d802f18d4434f34d5..395f7910f535bfd33a5676b011ab62a53e30e140 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -1147,6 +1147,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1157,6 +1157,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
public OfflinePlayer getOfflinePlayer(@NotNull String name);
diff --git a/patches/api/0219-Add-ignore-discounts-API.patch b/patches/api/0218-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/api/0219-Add-ignore-discounts-API.patch
rename to patches/api/0218-Add-ignore-discounts-API.patch
diff --git a/patches/api/0220-Item-no-age-no-player-pickup.patch b/patches/api/0219-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/api/0220-Item-no-age-no-player-pickup.patch
rename to patches/api/0219-Item-no-age-no-player-pickup.patch
diff --git a/patches/api/0221-Beacon-API-custom-effect-ranges.patch b/patches/api/0220-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/api/0221-Beacon-API-custom-effect-ranges.patch
rename to patches/api/0220-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/api/0222-Add-API-for-quit-reason.patch b/patches/api/0221-Add-API-for-quit-reason.patch
similarity index 100%
rename from patches/api/0222-Add-API-for-quit-reason.patch
rename to patches/api/0221-Add-API-for-quit-reason.patch
diff --git a/patches/api/0223-Add-Destroy-Speed-API.patch b/patches/api/0222-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/api/0223-Add-Destroy-Speed-API.patch
rename to patches/api/0222-Add-Destroy-Speed-API.patch
diff --git a/patches/api/0224-Add-LivingEntity-clearActiveItem.patch b/patches/api/0223-Add-LivingEntity-clearActiveItem.patch
similarity index 82%
rename from patches/api/0224-Add-LivingEntity-clearActiveItem.patch
rename to patches/api/0223-Add-LivingEntity-clearActiveItem.patch
index c90bd62fa6..ae2af3de67 100644
--- a/patches/api/0224-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/api/0223-Add-LivingEntity-clearActiveItem.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add LivingEntity#clearActiveItem
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 7dbb3737cd175365b89a5c8d0542b16e812b8629..bd871bf479cb9f4b31832ac5cb363f314b32a047 100644
+index 79ef7733ba6fd7d34f8bf87218779af5ba74d084..739a8ef8b0d141dd01a15df8666f31fef4fd590e 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1059,6 +1059,11 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1061,6 +1061,11 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*/
org.bukkit.inventory.@NotNull ItemStack getActiveItem();
diff --git a/patches/api/0225-Add-PlayerItemCooldownEvent.patch b/patches/api/0224-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/api/0225-Add-PlayerItemCooldownEvent.patch
rename to patches/api/0224-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/api/0226-More-lightning-API.patch b/patches/api/0225-More-lightning-API.patch
similarity index 100%
rename from patches/api/0226-More-lightning-API.patch
rename to patches/api/0225-More-lightning-API.patch
diff --git a/patches/api/0227-Add-PlayerShearBlockEvent.patch b/patches/api/0226-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/api/0227-Add-PlayerShearBlockEvent.patch
rename to patches/api/0226-Add-PlayerShearBlockEvent.patch
diff --git a/patches/api/0228-Player-Chunk-Load-Unload-Events.patch b/patches/api/0227-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/api/0228-Player-Chunk-Load-Unload-Events.patch
rename to patches/api/0227-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/api/0229-Expose-LivingEntity-hurt-direction.patch b/patches/api/0228-Expose-LivingEntity-hurt-direction.patch
similarity index 91%
rename from patches/api/0229-Expose-LivingEntity-hurt-direction.patch
rename to patches/api/0228-Expose-LivingEntity-hurt-direction.patch
index 2bff91fc78..49b8ae1828 100644
--- a/patches/api/0229-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/api/0228-Expose-LivingEntity-hurt-direction.patch
@@ -26,10 +26,10 @@ index 5ecfb98540c00da05b13bc5370debb89c52cc76f..083d5798ccc7f37c6df5e234c7ef2332
* Get the sleep ticks of the player. This value may be capped.
*
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index bd871bf479cb9f4b31832ac5cb363f314b32a047..54cdbfdc5d2280069045317bac919ff4689872f5 100644
+index 739a8ef8b0d141dd01a15df8666f31fef4fd590e..ac0f03b6b3d451b4540dd2efee729b32f7f9e371 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1199,4 +1199,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1201,4 +1201,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*/
void playPickupItemAnimation(@NotNull Item item, int quantity);
// Paper end - pickup animation API
diff --git a/patches/api/0230-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0229-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/api/0230-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/api/0229-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/api/0231-Added-PlayerTradeEvent.patch b/patches/api/0230-Added-PlayerTradeEvent.patch
similarity index 100%
rename from patches/api/0231-Added-PlayerTradeEvent.patch
rename to patches/api/0230-Added-PlayerTradeEvent.patch
diff --git a/patches/api/0232-Add-TargetHitEvent-API.patch b/patches/api/0231-Add-TargetHitEvent-API.patch
similarity index 100%
rename from patches/api/0232-Add-TargetHitEvent-API.patch
rename to patches/api/0231-Add-TargetHitEvent-API.patch
diff --git a/patches/api/0233-Additional-Block-Material-API-s.patch b/patches/api/0232-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/api/0233-Additional-Block-Material-API-s.patch
rename to patches/api/0232-Additional-Block-Material-API-s.patch
diff --git a/patches/api/0234-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0233-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
similarity index 100%
rename from patches/api/0234-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
rename to patches/api/0233-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/api/0235-Add-PlayerFlowerPotManipulateEvent.patch b/patches/api/0234-Add-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/api/0235-Add-PlayerFlowerPotManipulateEvent.patch
rename to patches/api/0234-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/api/0236-Zombie-API-breaking-doors.patch b/patches/api/0235-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/api/0236-Zombie-API-breaking-doors.patch
rename to patches/api/0235-Zombie-API-breaking-doors.patch
diff --git a/patches/api/0237-Add-EntityLoadCrossbowEvent.patch b/patches/api/0236-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/api/0237-Add-EntityLoadCrossbowEvent.patch
rename to patches/api/0236-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/api/0238-Added-WorldGameRuleChangeEvent.patch b/patches/api/0237-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/api/0238-Added-WorldGameRuleChangeEvent.patch
rename to patches/api/0237-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/api/0239-Added-ServerResourcesReloadedEvent.patch b/patches/api/0238-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/api/0239-Added-ServerResourcesReloadedEvent.patch
rename to patches/api/0238-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/api/0240-Add-BlockFailedDispenseEvent.patch b/patches/api/0239-Add-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/api/0240-Add-BlockFailedDispenseEvent.patch
rename to patches/api/0239-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/api/0241-Added-PlayerLecternPageChangeEvent.patch b/patches/api/0240-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/api/0241-Added-PlayerLecternPageChangeEvent.patch
rename to patches/api/0240-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/api/0242-Added-PlayerLoomPatternSelectEvent.patch b/patches/api/0241-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/api/0242-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/api/0241-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/api/0243-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0242-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
similarity index 100%
rename from patches/api/0243-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
rename to patches/api/0242-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
diff --git a/patches/api/0244-Add-sendOpLevel-API.patch b/patches/api/0243-Add-sendOpLevel-API.patch
similarity index 88%
rename from patches/api/0244-Add-sendOpLevel-API.patch
rename to patches/api/0243-Add-sendOpLevel-API.patch
index 3ea062cd8c..c6d0eae4c3 100644
--- a/patches/api/0244-Add-sendOpLevel-API.patch
+++ b/patches/api/0243-Add-sendOpLevel-API.patch
@@ -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 f52f35902cc6a8af5ee60cf815caef7a43372158..d735ed635022d170c6b1080ed87f3c2a799202f6 100644
+index 28a811be93b29f105dad1db91a8adccbdf9fcaf7..752b2bac47588c0f75a13a7e6ec2be3c2f5a149e 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3264,6 +3264,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3308,6 +3308,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
}
// Paper end - elytra boost API
diff --git a/patches/api/0245-Add-PaperRegistry.patch b/patches/api/0244-Add-PaperRegistry.patch
similarity index 100%
rename from patches/api/0245-Add-PaperRegistry.patch
rename to patches/api/0244-Add-PaperRegistry.patch
diff --git a/patches/api/0246-Add-StructuresLocateEvent.patch b/patches/api/0245-Add-StructuresLocateEvent.patch
similarity index 99%
rename from patches/api/0246-Add-StructuresLocateEvent.patch
rename to patches/api/0245-Add-StructuresLocateEvent.patch
index 746b674c5d..eacbdcf8ea 100644
--- a/patches/api/0246-Add-StructuresLocateEvent.patch
+++ b/patches/api/0245-Add-StructuresLocateEvent.patch
@@ -513,10 +513,10 @@ index 0000000000000000000000000000000000000000..1e7b53f9bc13dcd5a0a4a40004591e4f
+ }
+}
diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java
-index b3f8a2611ceb57f5d0b5c300fa80d8bad121498d..4bc53793aade0887fa650a4bbf51d2e57678bd90 100644
+index 18be407d4fb401d89f3a46a9bce044bacd8a888f..af3dab66c904d1fc0bbbdb8898e9ff8b2631bca7 100644
--- a/src/main/java/org/bukkit/Registry.java
+++ b/src/main/java/org/bukkit/Registry.java
-@@ -268,6 +268,17 @@ public interface Registry extends Iterable {
+@@ -283,6 +283,17 @@ public interface Registry extends Iterable {
* @see GameEvent
*/
Registry GAME_EVENT = Objects.requireNonNull(Bukkit.getRegistry(GameEvent.class), "No registry present for GameEvent. This is a bug.");
diff --git a/patches/api/0247-Add-BlockPreDispenseEvent.patch b/patches/api/0246-Add-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/api/0247-Add-BlockPreDispenseEvent.patch
rename to patches/api/0246-Add-BlockPreDispenseEvent.patch
diff --git a/patches/api/0248-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0247-Added-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/api/0248-Added-PlayerChangeBeaconEffectEvent.patch
rename to patches/api/0247-Added-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/api/0249-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0248-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/api/0249-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/api/0248-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/api/0250-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0249-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/api/0250-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/api/0249-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/api/0251-add-DragonEggFormEvent.patch b/patches/api/0250-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/api/0251-add-DragonEggFormEvent.patch
rename to patches/api/0250-add-DragonEggFormEvent.patch
diff --git a/patches/api/0252-EntityMoveEvent.patch b/patches/api/0251-EntityMoveEvent.patch
similarity index 100%
rename from patches/api/0252-EntityMoveEvent.patch
rename to patches/api/0251-EntityMoveEvent.patch
diff --git a/patches/api/0253-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0252-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/api/0253-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/api/0252-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/api/0254-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0253-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/api/0254-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/api/0253-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/api/0255-living-entity-allow-attribute-registration.patch b/patches/api/0254-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/api/0255-living-entity-allow-attribute-registration.patch
rename to patches/api/0254-living-entity-allow-attribute-registration.patch
diff --git a/patches/api/0256-Add-missing-effects.patch b/patches/api/0255-Add-missing-effects.patch
similarity index 94%
rename from patches/api/0256-Add-missing-effects.patch
rename to patches/api/0255-Add-missing-effects.patch
index 63c42ebfec..63710b51cc 100644
--- a/patches/api/0256-Add-missing-effects.patch
+++ b/patches/api/0255-Add-missing-effects.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add missing effects
Co-authored-by: Jake Potrebic
diff --git a/src/main/java/org/bukkit/Effect.java b/src/main/java/org/bukkit/Effect.java
-index 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..b8ad6ec6795433770604a1cc93384ef639e810bd 100644
+index fd9cf25f2fdef5ee3b7143f27e5f43dfe3f21a38..2d50f5e3f95e280ae5741514d5eba6440d9966ce 100644
--- a/src/main/java/org/bukkit/Effect.java
+++ b/src/main/java/org/bukkit/Effect.java
-@@ -132,12 +132,12 @@ public enum Effect {
+@@ -131,9 +131,9 @@ public enum Effect {
/**
* Sound of a block breaking. Needs block ID as additional info.
*/
@@ -20,12 +20,8 @@ index 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..b8ad6ec6795433770604a1cc93384ef6
+ * Visual effect of a splash potion breaking. Needs color data value as
* additional info.
*/
-- POTION_BREAK(2002, Type.VISUAL, Potion.class),
-+ POTION_BREAK(2002, Type.VISUAL, Color.class, Potion.class), // Paper - color is correct
- /**
- * Visual effect of an instant splash potion breaking. Needs color data
- * value as additional info.
-@@ -337,21 +337,146 @@ public enum Effect {
+ POTION_BREAK(2002, Type.VISUAL, Color.class),
+@@ -336,21 +336,146 @@ public enum Effect {
* block.
*/
OXIDISED_COPPER_SCRAPE(3005, Type.VISUAL),
@@ -176,7 +172,7 @@ index 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..b8ad6ec6795433770604a1cc93384ef6
}
/**
-@@ -367,8 +492,10 @@ public enum Effect {
+@@ -366,8 +491,10 @@ public enum Effect {
/**
* @return The type of the effect.
@@ -187,7 +183,7 @@ index 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..b8ad6ec6795433770604a1cc93384ef6
public Type getType() {
return this.type;
}
-@@ -379,8 +506,15 @@ public enum Effect {
+@@ -378,8 +505,15 @@ public enum Effect {
*/
@Nullable
public Class getData() {
@@ -204,7 +200,7 @@ index 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..b8ad6ec6795433770604a1cc93384ef6
/**
* Gets the Effect associated with the given ID.
-@@ -397,12 +531,26 @@ public enum Effect {
+@@ -396,12 +530,26 @@ public enum Effect {
static {
for (Effect effect : values()) {
diff --git a/patches/api/0257-Expose-Tracked-Players.patch b/patches/api/0256-Expose-Tracked-Players.patch
similarity index 84%
rename from patches/api/0257-Expose-Tracked-Players.patch
rename to patches/api/0256-Expose-Tracked-Players.patch
index 6c5f47bccd..368fb84d94 100644
--- a/patches/api/0257-Expose-Tracked-Players.patch
+++ b/patches/api/0256-Expose-Tracked-Players.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose Tracked Players
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 9711a8077238383f23fb7aa2c20b2c089776e3f8..b32683b5e4431950d9dccec3ae11f6377c7b0da7 100644
+index e9c3c5c4099f7bf7f83bde0b47fd193a3b401f0a..c7d6a328def83619dca9b6122aeb5870e4585e70 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -888,5 +888,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -899,5 +899,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
* Check if entity is inside a ticking chunk
*/
boolean isTicking();
diff --git a/patches/api/0258-Cache-the-result-of-Material-isBlock.patch b/patches/api/0257-Cache-the-result-of-Material-isBlock.patch
similarity index 81%
rename from patches/api/0258-Cache-the-result-of-Material-isBlock.patch
rename to patches/api/0257-Cache-the-result-of-Material-isBlock.patch
index ee04af53bb..6077bfb54d 100644
--- a/patches/api/0258-Cache-the-result-of-Material-isBlock.patch
+++ b/patches/api/0257-Cache-the-result-of-Material-isBlock.patch
@@ -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 af1dca2385215e8fd19353aa6e9c024d4ad814e1..85604d2c364c41fed24257a9b02ceeb58712f6a2 100644
+index 6551bb9409f9714033532b5cfe9219ed84e438f2..852217efbb8dfab445e625a61f8e7f7ba51e5fd6 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
-@@ -4643,6 +4643,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4681,6 +4681,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
public final Class data;
private final boolean legacy;
private final NamespacedKey key;
@@ -16,7 +16,7 @@ index af1dca2385215e8fd19353aa6e9c024d4ad814e1..85604d2c364c41fed24257a9b02ceeb5
private Material(final int id) {
this(id, 64);
-@@ -4841,6 +4842,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4879,6 +4880,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
* @return true if this material is a block
*/
public boolean isBlock() {
@@ -28,7 +28,7 @@ index af1dca2385215e8fd19353aa6e9c024d4ad814e1..85604d2c364c41fed24257a9b02ceeb5
switch (this) {
//
case ACACIA_BUTTON:
-@@ -6082,6 +6088,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -6123,6 +6129,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
static {
for (Material material : values()) {
BY_NAME.put(material.name(), material);
diff --git a/patches/api/0259-Add-worldborder-events.patch b/patches/api/0258-Add-worldborder-events.patch
similarity index 100%
rename from patches/api/0259-Add-worldborder-events.patch
rename to patches/api/0258-Add-worldborder-events.patch
diff --git a/patches/api/0260-added-PlayerNameEntityEvent.patch b/patches/api/0259-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/api/0260-added-PlayerNameEntityEvent.patch
rename to patches/api/0259-added-PlayerNameEntityEvent.patch
diff --git a/patches/api/0261-Add-recipe-to-cook-events.patch b/patches/api/0260-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/api/0261-Add-recipe-to-cook-events.patch
rename to patches/api/0260-Add-recipe-to-cook-events.patch
diff --git a/patches/api/0262-Add-Block-isValidTool.patch b/patches/api/0261-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/api/0262-Add-Block-isValidTool.patch
rename to patches/api/0261-Add-Block-isValidTool.patch
diff --git a/patches/api/0263-Expand-world-key-API.patch b/patches/api/0262-Expand-world-key-API.patch
similarity index 95%
rename from patches/api/0263-Expand-world-key-API.patch
rename to patches/api/0262-Expand-world-key-API.patch
index a6e79339f4..0beb2158ec 100644
--- a/patches/api/0263-Expand-world-key-API.patch
+++ b/patches/api/0262-Expand-world-key-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expand world key API
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index e832c6a8a10bc29d9ab20cbdf394cf836eb2f6a5..4b3c91575f2609ad1b1177384f6f21151a535054 100644
+index 732ed3724e784ad659cb4411dbd73b42a8330a2c..d078ea797cf4c6ab291aec3ad7fbd4740017286c 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -862,6 +862,18 @@ public final class Bukkit {
+@@ -864,6 +864,18 @@ public final class Bukkit {
public static World getWorld(@NotNull UUID uid) {
return server.getWorld(uid);
}
@@ -56,10 +56,10 @@ index 27eff0826d5b5b48697fefd9571886e7bbce74b1..d8b1fa79dc24138dc71e32c14bda71c1
// Paper end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 9477563308adc64fff065eb0a50654baa0d22b84..5bb94245c33105e57131b3d0867ef707c4aed79c 100644
+index 395f7910f535bfd33a5676b011ab62a53e30e140..e6598c36cfc98282f30a57105986a295f1c94676 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -720,6 +720,17 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -722,6 +722,17 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@Nullable
public World getWorld(@NotNull UUID uid);
diff --git a/patches/api/0264-Item-Rarity-API.patch b/patches/api/0263-Item-Rarity-API.patch
similarity index 95%
rename from patches/api/0264-Item-Rarity-API.patch
rename to patches/api/0263-Item-Rarity-API.patch
index b074dce96b..88e0562beb 100644
--- a/patches/api/0264-Item-Rarity-API.patch
+++ b/patches/api/0263-Item-Rarity-API.patch
@@ -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 85604d2c364c41fed24257a9b02ceeb58712f6a2..8fd928cfe61ab6f06c52eb5e4561fd6860e1f8d9 100644
+index 852217efbb8dfab445e625a61f8e7f7ba51e5fd6..b58383b5e3077cbd5df65b8147693aa9543493ef 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
-@@ -4709,6 +4709,17 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4747,6 +4747,17 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
return Bukkit.getUnsafe().getBlockTranslationKey(this);
}
}
diff --git a/patches/api/0265-Expose-protocol-version.patch b/patches/api/0264-Expose-protocol-version.patch
similarity index 100%
rename from patches/api/0265-Expose-protocol-version.patch
rename to patches/api/0264-Expose-protocol-version.patch
diff --git a/patches/api/0266-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0265-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/api/0266-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/api/0265-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/api/0267-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0266-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/api/0267-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/api/0266-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/api/0268-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0267-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/api/0268-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/api/0267-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/api/0269-Added-PlayerDeepSleepEvent.patch b/patches/api/0268-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/api/0269-Added-PlayerDeepSleepEvent.patch
rename to patches/api/0268-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/api/0270-More-World-API.patch b/patches/api/0269-More-World-API.patch
similarity index 96%
rename from patches/api/0270-More-World-API.patch
rename to patches/api/0269-More-World-API.patch
index 139bb504c0..7340819de5 100644
--- a/patches/api/0270-More-World-API.patch
+++ b/patches/api/0269-More-World-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] More World API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 0a7c97aa289687cfbf6ae1a222f5eb2850f8f43e..4f724c337da08da6bbc8b1452dbd64eefd54a879 100644
+index 77314fdbd99a5cc34e7a1df4692ba8a1685ef002..f4d31d9d0f4cbd2621adf97a20b65ae83e5fd064 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
-@@ -3833,6 +3833,122 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -3849,6 +3849,122 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@Nullable
StructureSearchResult locateNearestStructure(@NotNull Location origin, @NotNull Structure structure, int radius, boolean findUnexplored);
diff --git a/patches/api/0271-Added-PlayerBedFailEnterEvent.patch b/patches/api/0270-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/api/0271-Added-PlayerBedFailEnterEvent.patch
rename to patches/api/0270-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/api/0272-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0271-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/api/0272-Introduce-beacon-activation-deactivation-events.patch
rename to patches/api/0271-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/api/0273-PlayerMoveEvent-Improvements.patch b/patches/api/0272-PlayerMoveEvent-Improvements.patch
similarity index 100%
rename from patches/api/0273-PlayerMoveEvent-Improvements.patch
rename to patches/api/0272-PlayerMoveEvent-Improvements.patch
diff --git a/patches/api/0274-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0273-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/api/0274-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/api/0273-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/api/0275-Add-more-WanderingTrader-API.patch b/patches/api/0274-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/api/0275-Add-more-WanderingTrader-API.patch
rename to patches/api/0274-Add-more-WanderingTrader-API.patch
diff --git a/patches/api/0276-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0275-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/api/0276-Add-EntityBlockStorage-clearEntities.patch
rename to patches/api/0275-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/api/0277-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0276-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/api/0277-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/api/0276-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/api/0278-Inventory-close.patch b/patches/api/0277-Inventory-close.patch
similarity index 100%
rename from patches/api/0278-Inventory-close.patch
rename to patches/api/0277-Inventory-close.patch
diff --git a/patches/api/0279-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0278-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/api/0279-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/api/0278-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/api/0280-Add-basic-Datapack-API.patch b/patches/api/0279-Add-basic-Datapack-API.patch
similarity index 91%
rename from patches/api/0280-Add-basic-Datapack-API.patch
rename to patches/api/0279-Add-basic-Datapack-API.patch
index 61600f3668..6d8473b377 100644
--- a/patches/api/0280-Add-basic-Datapack-API.patch
+++ b/patches/api/0279-Add-basic-Datapack-API.patch
@@ -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 4b3c91575f2609ad1b1177384f6f21151a535054..6ac4c0c6c2245e6bee9575ff4804994648112d78 100644
+index d078ea797cf4c6ab291aec3ad7fbd4740017286c..c3d3c7d05a03658157d49c6ff1ea1d7d085a6fd4 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -328,9 +328,11 @@ public final class Bukkit {
+@@ -330,9 +330,11 @@ public final class Bukkit {
/**
* Get the DataPack Manager.
*
@@ -85,7 +85,7 @@ index 4b3c91575f2609ad1b1177384f6f21151a535054..6ac4c0c6c2245e6bee9575ff48049946
public static DataPackManager getDataPackManager() {
return server.getDataPackManager();
}
-@@ -2562,6 +2564,14 @@ public final class Bukkit {
+@@ -2585,6 +2587,14 @@ public final class Bukkit {
public static com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
return server.getMobGoals();
}
@@ -101,10 +101,10 @@ index 4b3c91575f2609ad1b1177384f6f21151a535054..6ac4c0c6c2245e6bee9575ff48049946
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 5bb94245c33105e57131b3d0867ef707c4aed79c..052d0e420f2631ff925bb5df4a41a1cecc2d7e16 100644
+index e6598c36cfc98282f30a57105986a295f1c94676..61ee087ec4a75ee8b10e204b4cdd1bab5f066819 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -264,9 +264,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -266,9 +266,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
/**
* Get the DataPack Manager.
*
@@ -116,7 +116,7 @@ index 5bb94245c33105e57131b3d0867ef707c4aed79c..052d0e420f2631ff925bb5df4a41a1ce
public DataPackManager getDataPackManager();
/**
-@@ -2232,5 +2234,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2251,5 +2253,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
com.destroystokyo.paper.entity.ai.MobGoals getMobGoals();
diff --git a/patches/api/0281-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0280-additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/api/0281-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/api/0280-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/api/0282-ItemStack-repair-check-API.patch b/patches/api/0281-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/api/0282-ItemStack-repair-check-API.patch
rename to patches/api/0281-ItemStack-repair-check-API.patch
diff --git a/patches/api/0283-More-Enchantment-API.patch b/patches/api/0282-More-Enchantment-API.patch
similarity index 96%
rename from patches/api/0283-More-Enchantment-API.patch
rename to patches/api/0282-More-Enchantment-API.patch
index e6ccd01964..8348605555 100644
--- a/patches/api/0283-More-Enchantment-API.patch
+++ b/patches/api/0282-More-Enchantment-API.patch
@@ -36,10 +36,10 @@ index 0000000000000000000000000000000000000000..e6a40c1fcea761bd66743b50e3da3d14
+ }
+}
diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java
-index 13f25ff4a4dd5a98f5f690c54e5cba6ef145c2d0..4264c6eb7e5794019859cfca592b57e574fcd833 100644
+index 5b831dc9666b68fd9f4497aa3b07beba13fb215f..9db31242d736a5be15b48f6cfada5a5121c212dd 100644
--- a/src/main/java/org/bukkit/enchantments/Enchantment.java
+++ b/src/main/java/org/bukkit/enchantments/Enchantment.java
-@@ -270,11 +270,7 @@ public abstract class Enchantment implements Keyed, Translatable, net.kyori.adve
+@@ -291,11 +291,7 @@ public abstract class Enchantment implements Keyed, Translatable, net.kyori.adve
* Cursed enchantments are found the same way treasure enchantments are
*
* @return true if the enchantment is cursed
@@ -51,7 +51,7 @@ index 13f25ff4a4dd5a98f5f690c54e5cba6ef145c2d0..4264c6eb7e5794019859cfca592b57e5
public abstract boolean isCursed();
/**
-@@ -308,6 +304,70 @@ public abstract class Enchantment implements Keyed, Translatable, net.kyori.adve
+@@ -329,6 +325,70 @@ public abstract class Enchantment implements Keyed, Translatable, net.kyori.adve
* @return the name of the enchantment with {@code level} applied
*/
public abstract net.kyori.adventure.text.@NotNull Component displayName(int level);
diff --git a/patches/api/0284-Add-Mob-lookAt-API.patch b/patches/api/0283-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/api/0284-Add-Mob-lookAt-API.patch
rename to patches/api/0283-Add-Mob-lookAt-API.patch
diff --git a/patches/api/0285-ItemStack-editMeta.patch b/patches/api/0284-ItemStack-editMeta.patch
similarity index 100%
rename from patches/api/0285-ItemStack-editMeta.patch
rename to patches/api/0284-ItemStack-editMeta.patch
diff --git a/patches/api/0286-Add-EntityInsideBlockEvent.patch b/patches/api/0285-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/api/0286-Add-EntityInsideBlockEvent.patch
rename to patches/api/0285-Add-EntityInsideBlockEvent.patch
diff --git a/patches/api/0287-Attributes-API-for-item-defaults.patch b/patches/api/0286-Attributes-API-for-item-defaults.patch
similarity index 93%
rename from patches/api/0287-Attributes-API-for-item-defaults.patch
rename to patches/api/0286-Attributes-API-for-item-defaults.patch
index ce95405628..ca7f6859c0 100644
--- a/patches/api/0287-Attributes-API-for-item-defaults.patch
+++ b/patches/api/0286-Attributes-API-for-item-defaults.patch
@@ -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 8fd928cfe61ab6f06c52eb5e4561fd6860e1f8d9..64ca3c676703eed55b4ac8a2d4561d483c6935b1 100644
+index b58383b5e3077cbd5df65b8147693aa9543493ef..d5bdd25f6243d99b6b8c0acd6980db977f75c7e4 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
-@@ -4720,6 +4720,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4758,6 +4758,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
public io.papermc.paper.inventory.ItemRarity getItemRarity() {
return Bukkit.getUnsafe().getItemRarity(this);
}
diff --git a/patches/api/0288-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0287-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/api/0288-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/api/0287-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/api/0289-More-Lidded-Block-API.patch b/patches/api/0288-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/api/0289-More-Lidded-Block-API.patch
rename to patches/api/0288-More-Lidded-Block-API.patch
diff --git a/patches/api/0290-Add-PlayerKickEvent-causes.patch b/patches/api/0289-Add-PlayerKickEvent-causes.patch
similarity index 96%
rename from patches/api/0290-Add-PlayerKickEvent-causes.patch
rename to patches/api/0289-Add-PlayerKickEvent-causes.patch
index b23128c57d..eea9e754d1 100644
--- a/patches/api/0290-Add-PlayerKickEvent-causes.patch
+++ b/patches/api/0289-Add-PlayerKickEvent-causes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerKickEvent causes
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d735ed635022d170c6b1080ed87f3c2a799202f6..4906bec154d0f60420fbe2cffa8c7df0918ca61b 100644
+index 752b2bac47588c0f75a13a7e6ec2be3c2f5a149e..b177daa7a974125dc4ccf1bc6d119ad42dba3514 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -277,6 +277,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -321,6 +321,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param message kick message
*/
void kick(final net.kyori.adventure.text.@Nullable Component message);
diff --git a/patches/api/0291-Add-PufferFishStateChangeEvent.patch b/patches/api/0290-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/api/0291-Add-PufferFishStateChangeEvent.patch
rename to patches/api/0290-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/api/0292-Add-BellRevealRaiderEvent.patch b/patches/api/0291-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/api/0292-Add-BellRevealRaiderEvent.patch
rename to patches/api/0291-Add-BellRevealRaiderEvent.patch
diff --git a/patches/api/0293-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0292-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/api/0293-Add-ElderGuardianAppearanceEvent.patch
rename to patches/api/0292-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/api/0294-Add-more-line-of-sight-methods.patch b/patches/api/0293-Add-more-line-of-sight-methods.patch
similarity index 95%
rename from patches/api/0294-Add-more-line-of-sight-methods.patch
rename to patches/api/0293-Add-more-line-of-sight-methods.patch
index cd8d86699e..01d7f5db31 100644
--- a/patches/api/0294-Add-more-line-of-sight-methods.patch
+++ b/patches/api/0293-Add-more-line-of-sight-methods.patch
@@ -23,7 +23,7 @@ index d8b1fa79dc24138dc71e32c14bda71c1d570ed88..b68367f123f029c3ff47eab6bfabd7a8
// Paper end
}
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 54cdbfdc5d2280069045317bac919ff4689872f5..42ece8fd69f35fe38d9e49eed1d578d19229d721 100644
+index ac0f03b6b3d451b4540dd2efee729b32f7f9e371..19aecfc5d9387d9ae94890036f845b58a9327642 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -622,6 +622,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0295-Add-WaterBottleSplashEvent.patch b/patches/api/0294-Add-WaterBottleSplashEvent.patch
similarity index 100%
rename from patches/api/0295-Add-WaterBottleSplashEvent.patch
rename to patches/api/0294-Add-WaterBottleSplashEvent.patch
diff --git a/patches/api/0296-Add-more-LimitedRegion-API.patch b/patches/api/0295-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/api/0296-Add-more-LimitedRegion-API.patch
rename to patches/api/0295-Add-more-LimitedRegion-API.patch
diff --git a/patches/api/0297-Missing-Entity-API.patch b/patches/api/0296-Missing-Entity-API.patch
similarity index 98%
rename from patches/api/0297-Missing-Entity-API.patch
rename to patches/api/0296-Missing-Entity-API.patch
index 76a4b85361..ed30fe8df6 100644
--- a/patches/api/0297-Missing-Entity-API.patch
+++ b/patches/api/0296-Missing-Entity-API.patch
@@ -143,10 +143,10 @@ index 0d88dce9978243a1f995c5fb448c5d71b01136eb..8b1048c94dffd058eb9fd9144f7f59fc
+ // Paper end - Horse API
}
diff --git a/src/main/java/org/bukkit/entity/AreaEffectCloud.java b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
-index 8d6caae8ba11e1fe73cd5f88657eaac5f66c9d3d..fc59d6d4c2d43b09aef3a6f30b73d26280e831fa 100644
+index 3c65da551aca046986fc0302de3ccc149ee9526c..7f989f2025d16b368829c45f08b8cc8537c99e13 100644
--- a/src/main/java/org/bukkit/entity/AreaEffectCloud.java
+++ b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
-@@ -259,4 +259,20 @@ public interface AreaEffectCloud extends Entity {
+@@ -239,4 +239,20 @@ public interface AreaEffectCloud extends Entity {
* @param source the {@link ProjectileSource} that threw the LingeringPotion
*/
public void setSource(@Nullable ProjectileSource source);
@@ -417,7 +417,7 @@ index 9e7f42caab1204036f4203354c115fd40c6def92..138d2530de2410f4a9424dabd3e5ce0c
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index b32683b5e4431950d9dccec3ae11f6377c7b0da7..b2466aa08ebb26f3a5edd6a4b2c7e12f7a90ef0a 100644
+index c7d6a328def83619dca9b6122aeb5870e4585e70..795e799fec7cfd65a0e08bb3f941148d85ff4c3b 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -289,6 +289,40 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -585,10 +585,10 @@ index 6b3c9bef9a8a34ddc6ff42cf358541a2665bf5e3..9c618a27d590f186f29c5d9094fc565e
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 42ece8fd69f35fe38d9e49eed1d578d19229d721..5d62d7393dde2ccf56e9c09d44e17fdde79cf760 100644
+index 19aecfc5d9387d9ae94890036f845b58a9327642..0b789c2732e2d86f3201e65004543322a9a28b8b 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -992,6 +992,7 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -994,6 +994,7 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*
* @param invisible If the entity is invisible
*/
@@ -596,7 +596,7 @@ index 42ece8fd69f35fe38d9e49eed1d578d19229d721..5d62d7393dde2ccf56e9c09d44e17fdd
public void setInvisible(boolean invisible);
/**
-@@ -999,6 +1000,7 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1001,6 +1002,7 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*
* @return Whether the entity is invisible
*/
@@ -604,7 +604,7 @@ index 42ece8fd69f35fe38d9e49eed1d578d19229d721..5d62d7393dde2ccf56e9c09d44e17fdd
public boolean isInvisible();
// Paper start
-@@ -1035,6 +1037,57 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1037,6 +1039,57 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
void setShieldBlockingDelay(int delay);
// Paper end
diff --git a/patches/api/0298-Adds-PlayerArmSwingEvent.patch b/patches/api/0297-Adds-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/api/0298-Adds-PlayerArmSwingEvent.patch
rename to patches/api/0297-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/api/0299-Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/0298-Add-PlayerSignCommandPreprocessEvent.patch
similarity index 100%
rename from patches/api/0299-Add-PlayerSignCommandPreprocessEvent.patch
rename to patches/api/0298-Add-PlayerSignCommandPreprocessEvent.patch
diff --git a/patches/api/0300-fix-empty-array-elements-in-command-arguments.patch b/patches/api/0299-fix-empty-array-elements-in-command-arguments.patch
similarity index 100%
rename from patches/api/0300-fix-empty-array-elements-in-command-arguments.patch
rename to patches/api/0299-fix-empty-array-elements-in-command-arguments.patch
diff --git a/patches/api/0301-Stinger-API.patch b/patches/api/0300-Stinger-API.patch
similarity index 95%
rename from patches/api/0301-Stinger-API.patch
rename to patches/api/0300-Stinger-API.patch
index bef937b254..14aff16ae5 100644
--- a/patches/api/0301-Stinger-API.patch
+++ b/patches/api/0300-Stinger-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Stinger API
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 5d62d7393dde2ccf56e9c09d44e17fdde79cf760..be9fa1b6209a41712767283c6329046ca2795c09 100644
+index 0b789c2732e2d86f3201e65004543322a9a28b8b..b5551eed2e9090dcbbe97cae25a0c0545285c64f 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -451,6 +451,52 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0302-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0301-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/api/0302-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/api/0301-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/api/0303-Add-PlayerSetSpawnEvent.patch b/patches/api/0302-Add-PlayerSetSpawnEvent.patch
similarity index 100%
rename from patches/api/0303-Add-PlayerSetSpawnEvent.patch
rename to patches/api/0302-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/api/0304-Added-EntityDamageItemEvent.patch b/patches/api/0303-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/api/0304-Added-EntityDamageItemEvent.patch
rename to patches/api/0303-Added-EntityDamageItemEvent.patch
diff --git a/patches/api/0305-Make-EntityUnleashEvent-cancellable.patch b/patches/api/0304-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/api/0305-Make-EntityUnleashEvent-cancellable.patch
rename to patches/api/0304-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/api/0306-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0305-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/api/0306-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/api/0305-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/api/0307-Add-BlockBreakBlockEvent.patch b/patches/api/0306-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/api/0307-Add-BlockBreakBlockEvent.patch
rename to patches/api/0306-Add-BlockBreakBlockEvent.patch
diff --git a/patches/api/0308-Add-helpers-for-left-right-click-to-Action.patch b/patches/api/0307-Add-helpers-for-left-right-click-to-Action.patch
similarity index 100%
rename from patches/api/0308-Add-helpers-for-left-right-click-to-Action.patch
rename to patches/api/0307-Add-helpers-for-left-right-click-to-Action.patch
diff --git a/patches/api/0309-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/api/0308-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/api/0309-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/api/0308-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/api/0310-More-CommandBlock-API.patch b/patches/api/0309-More-CommandBlock-API.patch
similarity index 100%
rename from patches/api/0310-More-CommandBlock-API.patch
rename to patches/api/0309-More-CommandBlock-API.patch
diff --git a/patches/api/0311-Add-missing-team-sidebar-display-slots.patch b/patches/api/0310-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/api/0311-Add-missing-team-sidebar-display-slots.patch
rename to patches/api/0310-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/api/0312-add-back-EntityPortalExitEvent.patch b/patches/api/0311-add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/api/0312-add-back-EntityPortalExitEvent.patch
rename to patches/api/0311-add-back-EntityPortalExitEvent.patch
diff --git a/patches/api/0313-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0312-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 95%
rename from patches/api/0313-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/api/0312-Add-methods-to-find-targets-for-lightning-strikes.patch
index 9c34b1a23f..ffa6fc8f05 100644
--- a/patches/api/0313-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/api/0312-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 4f724c337da08da6bbc8b1452dbd64eefd54a879..5c61b9964e9abe76b5604c73bdd211a9c1c9b619 100644
+index f4d31d9d0f4cbd2621adf97a20b65ae83e5fd064..6953851a5177e9df3746f7a743f27ef02845e522 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -746,6 +746,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0314-Get-entity-default-attributes.patch b/patches/api/0313-Get-entity-default-attributes.patch
similarity index 94%
rename from patches/api/0314-Get-entity-default-attributes.patch
rename to patches/api/0313-Get-entity-default-attributes.patch
index 281ddf96f2..4da56e835d 100644
--- a/patches/api/0314-Get-entity-default-attributes.patch
+++ b/patches/api/0313-Get-entity-default-attributes.patch
@@ -32,10 +32,10 @@ index db8ffa9b303b9128be175f383fdf838a4e0719e5..b205937d1cd627c1dd660277f69891b5
// Paper end
}
diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
-index 550d66e0d41878717c6a92caade4a8413674f012..4aaf268f58038cd5d4101ec3fbfdc20b544d6678 100644
+index 4ff2f0b70a89b3d1fb3f588d014e09b3cf8ed16f..3f8ca9c4c51b14818fe1bebf56a032e10f14c758 100644
--- a/src/main/java/org/bukkit/entity/EntityType.java
+++ b/src/main/java/org/bukkit/entity/EntityType.java
-@@ -457,6 +457,25 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans
+@@ -452,6 +452,25 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans
Preconditions.checkArgument(this != UNKNOWN, "UNKNOWN entities do not have translation keys");
return org.bukkit.Bukkit.getUnsafe().getTranslationKey(this);
}
diff --git a/patches/api/0315-Left-handed-API.patch b/patches/api/0314-Left-handed-API.patch
similarity index 100%
rename from patches/api/0315-Left-handed-API.patch
rename to patches/api/0314-Left-handed-API.patch
diff --git a/patches/api/0316-Add-critical-damage-API.patch b/patches/api/0315-Add-critical-damage-API.patch
similarity index 100%
rename from patches/api/0316-Add-critical-damage-API.patch
rename to patches/api/0315-Add-critical-damage-API.patch
diff --git a/patches/api/0317-Add-more-advancement-API.patch b/patches/api/0316-Add-more-advancement-API.patch
similarity index 100%
rename from patches/api/0317-Add-more-advancement-API.patch
rename to patches/api/0316-Add-more-advancement-API.patch
diff --git a/patches/api/0318-Fix-issues-with-mob-conversion.patch b/patches/api/0317-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/api/0318-Fix-issues-with-mob-conversion.patch
rename to patches/api/0317-Fix-issues-with-mob-conversion.patch
diff --git a/patches/api/0319-Add-isCollidable-methods-to-various-places.patch b/patches/api/0318-Add-isCollidable-methods-to-various-places.patch
similarity index 90%
rename from patches/api/0319-Add-isCollidable-methods-to-various-places.patch
rename to patches/api/0318-Add-isCollidable-methods-to-various-places.patch
index 65ecfe9e6c..d6f48e9138 100644
--- a/patches/api/0319-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/api/0318-Add-isCollidable-methods-to-various-places.patch
@@ -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 64ca3c676703eed55b4ac8a2d4561d483c6935b1..9f86ad25a57b3f6e6bda1ce657833837cb3b2292 100644
+index d5bdd25f6243d99b6b8c0acd6980db977f75c7e4..fab8dfb1bd80490f6891687914997cc8580542cd 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
-@@ -4735,6 +4735,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4773,6 +4773,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
public Multimap getItemAttributes(@NotNull EquipmentSlot equipmentSlot) {
return Bukkit.getUnsafe().getItemAttributes(this, equipmentSlot);
}
@@ -63,10 +63,10 @@ index b5fe76a6353816a2d009dfa5921f8ada92984f34..42cc4f2ee960c0abf9c6688aeee41507
/**
diff --git a/src/main/java/org/bukkit/block/BlockState.java b/src/main/java/org/bukkit/block/BlockState.java
-index a4f0a5270693e1c4af4fad827fa0a2ce753e07b5..c439cf0bb6c50db2b3304c60e50046f096392f9f 100644
+index fd4a9bdcfb6775dfbdb7492e6c9eb90722d2ecdc..e573e70d9e74e444783a7363e6cdac126124d86d 100644
--- a/src/main/java/org/bukkit/block/BlockState.java
+++ b/src/main/java/org/bukkit/block/BlockState.java
-@@ -235,4 +235,13 @@ public interface BlockState extends Metadatable {
+@@ -245,4 +245,13 @@ public interface BlockState extends Metadatable {
* or 'virtual' (e.g. on an itemstack)
*/
boolean isPlaced();
diff --git a/patches/api/0320-Goat-ram-API.patch b/patches/api/0319-Goat-ram-API.patch
similarity index 100%
rename from patches/api/0320-Goat-ram-API.patch
rename to patches/api/0319-Goat-ram-API.patch
diff --git a/patches/api/0321-Add-API-for-resetting-a-single-score.patch b/patches/api/0320-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/api/0321-Add-API-for-resetting-a-single-score.patch
rename to patches/api/0320-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/api/0322-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0321-Add-Raw-Byte-Entity-Serialization.patch
similarity index 94%
rename from patches/api/0322-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/api/0321-Add-Raw-Byte-Entity-Serialization.patch
index 9e3ef08d86..d23f9d0469 100644
--- a/patches/api/0322-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/api/0321-Add-Raw-Byte-Entity-Serialization.patch
@@ -24,10 +24,10 @@ index ca0b126bff245ed3fe69bc49c28499f7a7aa9556..6426d8585bba71b3e998b1eb078ac0fc
* Creates and returns the next EntityId available.
*
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index b2466aa08ebb26f3a5edd6a4b2c7e12f7a90ef0a..d4f84318265343242a9fca565e456c7a8c1d68f7 100644
+index 795e799fec7cfd65a0e08bb3f941148d85ff4c3b..461a48f8aa049e9b9e13acca3d54978212d9688c 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -931,5 +931,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -942,5 +942,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
@Deprecated
@NotNull Set getTrackedPlayers();
diff --git a/patches/api/0323-Add-PlayerItemFrameChangeEvent.patch b/patches/api/0322-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/api/0323-Add-PlayerItemFrameChangeEvent.patch
rename to patches/api/0322-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/api/0324-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0323-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 92%
rename from patches/api/0324-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/api/0323-Allow-delegation-to-vanilla-chunk-gen.patch
index df4b25e905..664279d84f 100644
--- a/patches/api/0324-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/api/0323-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -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 6ac4c0c6c2245e6bee9575ff4804994648112d78..3d0e5045f0d6bf3bee4a94e552a57d2b7d481c02 100644
+index c3d3c7d05a03658157d49c6ff1ea1d7d085a6fd4..fa7a63ea108971790c28c4f32d280ee6f2a86c0b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2082,6 +2082,24 @@ public final class Bukkit {
+@@ -2105,6 +2105,24 @@ public final class Bukkit {
return server.createChunkData(world);
}
@@ -34,10 +34,10 @@ index 6ac4c0c6c2245e6bee9575ff4804994648112d78..3d0e5045f0d6bf3bee4a94e552a57d2b
* 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 052d0e420f2631ff925bb5df4a41a1cecc2d7e16..b4e520b82c026c62e5bd3840aa80cdc8d177b6f1 100644
+index 61ee087ec4a75ee8b10e204b4cdd1bab5f066819..90b1368303562e1b4af2e658e60ac564bd49ad5f 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -1760,6 +1760,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1779,6 +1779,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
public ChunkGenerator.ChunkData createChunkData(@NotNull World world);
diff --git a/patches/api/0325-Add-more-Campfire-API.patch b/patches/api/0324-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/api/0325-Add-more-Campfire-API.patch
rename to patches/api/0324-Add-more-Campfire-API.patch
diff --git a/patches/api/0326-Extend-VehicleCollisionEvent-move-HandlerList-up.patch b/patches/api/0325-Extend-VehicleCollisionEvent-move-HandlerList-up.patch
similarity index 100%
rename from patches/api/0326-Extend-VehicleCollisionEvent-move-HandlerList-up.patch
rename to patches/api/0325-Extend-VehicleCollisionEvent-move-HandlerList-up.patch
diff --git a/patches/api/0327-Improve-scoreboard-entries.patch b/patches/api/0326-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/api/0327-Improve-scoreboard-entries.patch
rename to patches/api/0326-Improve-scoreboard-entries.patch
diff --git a/patches/api/0328-Entity-powdered-snow-API.patch b/patches/api/0327-Entity-powdered-snow-API.patch
similarity index 85%
rename from patches/api/0328-Entity-powdered-snow-API.patch
rename to patches/api/0327-Entity-powdered-snow-API.patch
index 0eaf448d96..b00af3e946 100644
--- a/patches/api/0328-Entity-powdered-snow-API.patch
+++ b/patches/api/0327-Entity-powdered-snow-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity powdered snow API
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index d4f84318265343242a9fca565e456c7a8c1d68f7..6db147a2330e8046c1bfb5ec2acd8dd30827d475 100644
+index 461a48f8aa049e9b9e13acca3d54978212d9688c..1cfeb862f6a036cfd68b60cdc2364834f353f4b4 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -958,5 +958,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -969,5 +969,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
* @return Whether the entity was successfully spawned.
*/
public boolean spawnAt(@NotNull Location location, @NotNull org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason);
@@ -22,7 +22,7 @@ index d4f84318265343242a9fca565e456c7a8c1d68f7..6db147a2330e8046c1bfb5ec2acd8dd3
// Paper end
}
diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java
-index 01d838a60d056bf4b4a8ef9d0ac18c6f91f412e6..c61eba5f400d146a8643542048904e353df94f4b 100644
+index e0ccc090a0be507ced4d5669491311e410f60a67..472a71ca8dad0d49f0723e5fdf58bf00a55190f2 100644
--- a/src/main/java/org/bukkit/entity/Skeleton.java
+++ b/src/main/java/org/bukkit/entity/Skeleton.java
@@ -41,6 +41,16 @@ public interface Skeleton extends AbstractSkeleton {
diff --git a/patches/api/0329-Add-API-for-item-entity-health.patch b/patches/api/0328-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/api/0329-Add-API-for-item-entity-health.patch
rename to patches/api/0328-Add-API-for-item-entity-health.patch
diff --git a/patches/api/0330-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0329-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/api/0330-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/api/0329-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/api/0331-Bucketable-API.patch b/patches/api/0330-Bucketable-API.patch
similarity index 100%
rename from patches/api/0331-Bucketable-API.patch
rename to patches/api/0330-Bucketable-API.patch
diff --git a/patches/api/0332-System-prop-for-default-config-comment-parsing.patch b/patches/api/0331-System-prop-for-default-config-comment-parsing.patch
similarity index 100%
rename from patches/api/0332-System-prop-for-default-config-comment-parsing.patch
rename to patches/api/0331-System-prop-for-default-config-comment-parsing.patch
diff --git a/patches/api/0333-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0332-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 100%
rename from patches/api/0333-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/api/0332-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/api/0334-Multiple-Entries-with-Scoreboards.patch b/patches/api/0333-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/api/0334-Multiple-Entries-with-Scoreboards.patch
rename to patches/api/0333-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/api/0335-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0334-Warn-on-strange-EventHandler-return-types.patch
similarity index 100%
rename from patches/api/0335-Warn-on-strange-EventHandler-return-types.patch
rename to patches/api/0334-Warn-on-strange-EventHandler-return-types.patch
diff --git a/patches/api/0336-Multi-Block-Change-API.patch b/patches/api/0335-Multi-Block-Change-API.patch
similarity index 92%
rename from patches/api/0336-Multi-Block-Change-API.patch
rename to patches/api/0335-Multi-Block-Change-API.patch
index 8aa5be5a5c..46d8adeb56 100644
--- a/patches/api/0336-Multi-Block-Change-API.patch
+++ b/patches/api/0335-Multi-Block-Change-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Multi Block Change API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 4906bec154d0f60420fbe2cffa8c7df0918ca61b..2501533048e4de25672d9cc0a52fa1150e6d8adb 100644
+index b177daa7a974125dc4ccf1bc6d119ad42dba3514..cd2d59a8a098227ec7725d121a63cc90e2a139fa 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -895,6 +895,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -939,6 +939,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void sendBlockDamage(@NotNull Location loc, float progress);
diff --git a/patches/api/0337-Fix-NotePlayEvent.patch b/patches/api/0336-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/api/0337-Fix-NotePlayEvent.patch
rename to patches/api/0336-Fix-NotePlayEvent.patch
diff --git a/patches/api/0338-Freeze-Tick-Lock-API.patch b/patches/api/0337-Freeze-Tick-Lock-API.patch
similarity index 92%
rename from patches/api/0338-Freeze-Tick-Lock-API.patch
rename to patches/api/0337-Freeze-Tick-Lock-API.patch
index a6c48fa931..baaf0b2462 100644
--- a/patches/api/0338-Freeze-Tick-Lock-API.patch
+++ b/patches/api/0337-Freeze-Tick-Lock-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 6db147a2330e8046c1bfb5ec2acd8dd30827d475..8827defeb26593cb2c2391e505b008f1190b01f3 100644
+index 1cfeb862f6a036cfd68b60cdc2364834f353f4b4..0cbf946c4f0f47ddfb59b23905968313f25294b1 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -323,6 +323,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0339-Dolphin-API.patch b/patches/api/0338-Dolphin-API.patch
similarity index 100%
rename from patches/api/0339-Dolphin-API.patch
rename to patches/api/0338-Dolphin-API.patch
diff --git a/patches/api/0340-More-PotionEffectType-API.patch b/patches/api/0339-More-PotionEffectType-API.patch
similarity index 92%
rename from patches/api/0340-More-PotionEffectType-API.patch
rename to patches/api/0339-More-PotionEffectType-API.patch
index 68309b095d..bb5ee7ea75 100644
--- a/patches/api/0340-More-PotionEffectType-API.patch
+++ b/patches/api/0339-More-PotionEffectType-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] More PotionEffectType API
diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java
-index 4bc53793aade0887fa650a4bbf51d2e57678bd90..18c672f3855a329bf8f87a9de81b677e8e360b41 100644
+index af3dab66c904d1fc0bbbdb8898e9ff8b2631bca7..ff870d18f3870d1432167516b166cece075d77bc 100644
--- a/src/main/java/org/bukkit/Registry.java
+++ b/src/main/java/org/bukkit/Registry.java
-@@ -277,6 +277,31 @@ public interface Registry extends Iterable {
+@@ -292,6 +292,31 @@ public interface Registry extends Iterable {
*/
@Deprecated(forRemoval = true)
Registry CONFIGURED_STRUCTURE = Bukkit.getRegistry(io.papermc.paper.world.structure.ConfiguredStructure.class);
@@ -41,7 +41,7 @@ index 4bc53793aade0887fa650a4bbf51d2e57678bd90..18c672f3855a329bf8f87a9de81b677e
/**
diff --git a/src/main/java/org/bukkit/potion/PotionEffectType.java b/src/main/java/org/bukkit/potion/PotionEffectType.java
-index f97dff2fd90cc8c35cbde04d1ace81320a8e4658..7d2f2fb6d4a786d15d61fde2ef03783b85d0c47b 100644
+index e045e6a74821f291938cc6af86e313c1f1c4626c..e77cf365cefafbeba09123187e70fd5274f10d53 100644
--- a/src/main/java/org/bukkit/potion/PotionEffectType.java
+++ b/src/main/java/org/bukkit/potion/PotionEffectType.java
@@ -16,7 +16,7 @@ import org.jetbrains.annotations.Nullable;
@@ -53,10 +53,11 @@ index f97dff2fd90cc8c35cbde04d1ace81320a8e4658..7d2f2fb6d4a786d15d61fde2ef03783b
private static final BiMap ID_MAP = HashBiMap.create();
/**
-@@ -352,4 +352,56 @@ public abstract class PotionEffectType implements Keyed, Translatable {
-
- return from;
+@@ -352,4 +352,57 @@ public abstract class PotionEffectType implements Keyed, Translatable {
+ public static PotionEffectType[] values() {
+ return Lists.newArrayList(Registry.EFFECT).toArray(new PotionEffectType[0]);
}
++
+ // Paper start
+ /**
+ * Gets the effect attributes in an immutable map.
diff --git a/patches/api/0341-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0340-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 87%
rename from patches/api/0341-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/api/0340-API-for-creating-command-sender-which-forwards-feedb.patch
index b73fdc4cb4..13d096a366 100644
--- a/patches/api/0341-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/api/0340-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] API for creating command sender which forwards feedback
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 3d0e5045f0d6bf3bee4a94e552a57d2b7d481c02..f941836afda889d8824b1f89bfe9a66cf71ed2a0 100644
+index fa7a63ea108971790c28c4f32d280ee6f2a86c0b..fb6a3b71cf3c304c5d0177747bc098e134b22d58 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1571,6 +1571,20 @@ public final class Bukkit {
+@@ -1583,6 +1583,20 @@ public final class Bukkit {
return server.getConsoleSender();
}
@@ -30,10 +30,10 @@ index 3d0e5045f0d6bf3bee4a94e552a57d2b7d481c02..f941836afda889d8824b1f89bfe9a66c
* Gets the folder that contains all of the various {@link World}s.
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b4e520b82c026c62e5bd3840aa80cdc8d177b6f1..aee14b81d16c26c3c7e1c5849a829bfe012aa5fb 100644
+index 90b1368303562e1b4af2e658e60ac564bd49ad5f..43b049b68a8af548cd05c67dafc23dabd07bab27 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -1324,6 +1324,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1334,6 +1334,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
public ConsoleCommandSender getConsoleSender();
diff --git a/patches/api/0342-Implement-regenerateChunk.patch b/patches/api/0341-Implement-regenerateChunk.patch
similarity index 91%
rename from patches/api/0342-Implement-regenerateChunk.patch
rename to patches/api/0341-Implement-regenerateChunk.patch
index 923a9fbcd0..8f63e4dd7a 100644
--- a/patches/api/0342-Implement-regenerateChunk.patch
+++ b/patches/api/0341-Implement-regenerateChunk.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement regenerateChunk
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 5c61b9964e9abe76b5604c73bdd211a9c1c9b619..7ff0ac9c78c3793791afbfa344a9ced3821d9638 100644
+index 6953851a5177e9df3746f7a743f27ef02845e522..d7f4a9c634b3a7b2668f296dce108cc6fc3046df 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -486,8 +486,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0343-Add-GameEvent-tags.patch b/patches/api/0342-Add-GameEvent-tags.patch
similarity index 78%
rename from patches/api/0343-Add-GameEvent-tags.patch
rename to patches/api/0342-Add-GameEvent-tags.patch
index 1bbdc9c696..73554bb169 100644
--- a/patches/api/0343-Add-GameEvent-tags.patch
+++ b/patches/api/0342-Add-GameEvent-tags.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Add GameEvent tags
diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index 894e72aa97cd272ae57a91165cca0737a6d5742d..dd509bd1f7e80a04a63d2ba6eca1ff845d12fb2d 100644
+index 298ae1294a122705bca6bd74ea540185839d1ed5..cb5890e0e7bccfee2ba32dd4776f1ae1fdd539e8 100644
--- a/src/main/java/org/bukkit/Tag.java
+++ b/src/main/java/org/bukkit/Tag.java
-@@ -983,6 +983,25 @@ public interface Tag extends Keyed {
+@@ -1306,6 +1306,25 @@ public interface Tag extends Keyed {
*/
- Tag ENTITY_TYPES_CAN_TURN_IN_BOATS = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("can_turn_in_boats"), EntityType.class);
+ Tag ENTITY_TYPES_REDIRECTABLE_PROJECTILE = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("redirectable_projectile"), EntityType.class);
+ // Paper start
+ String REGISTRY_GAME_EVENTS = "game_events";
diff --git a/patches/api/0344-Furnace-RecipesUsed-API.patch b/patches/api/0343-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/api/0344-Furnace-RecipesUsed-API.patch
rename to patches/api/0343-Furnace-RecipesUsed-API.patch
diff --git a/patches/api/0345-Configurable-sculk-sensor-listener-range.patch b/patches/api/0344-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/api/0345-Configurable-sculk-sensor-listener-range.patch
rename to patches/api/0344-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/api/0346-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0345-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/api/0346-Add-missing-block-data-mins-and-maxes.patch
rename to patches/api/0345-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/api/0347-Custom-Potion-Mixes.patch b/patches/api/0346-Custom-Potion-Mixes.patch
similarity index 96%
rename from patches/api/0347-Custom-Potion-Mixes.patch
rename to patches/api/0346-Custom-Potion-Mixes.patch
index e070ceabb2..1e3c724a0e 100644
--- a/patches/api/0347-Custom-Potion-Mixes.patch
+++ b/patches/api/0346-Custom-Potion-Mixes.patch
@@ -155,10 +155,10 @@ index 0000000000000000000000000000000000000000..3ede1e8f7bf0436fdc5bf395c0f9eaf1
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index f941836afda889d8824b1f89bfe9a66cf71ed2a0..22ec7dda6853db6539e98e8d39d8a13be8926f07 100644
+index fb6a3b71cf3c304c5d0177747bc098e134b22d58..eb6d59bad1e4f0b394290d683f5dfed6ba6dd75b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2604,6 +2604,15 @@ public final class Bukkit {
+@@ -2627,6 +2627,15 @@ public final class Bukkit {
public static io.papermc.paper.datapack.DatapackManager getDatapackManager() {
return server.getDatapackManager();
}
@@ -175,10 +175,10 @@ index f941836afda889d8824b1f89bfe9a66cf71ed2a0..22ec7dda6853db6539e98e8d39d8a13b
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index aee14b81d16c26c3c7e1c5849a829bfe012aa5fb..96f9f3ac492eb6f4628d47f0be4239ab9bc7df54 100644
+index 43b049b68a8af548cd05c67dafc23dabd07bab27..6da6c20b684eba64b85d67db2482b4a968749070 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -2268,5 +2268,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2287,5 +2287,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
io.papermc.paper.datapack.DatapackManager getDatapackManager();
diff --git a/patches/api/0348-Expose-furnace-minecart-push-values.patch b/patches/api/0347-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/api/0348-Expose-furnace-minecart-push-values.patch
rename to patches/api/0347-Expose-furnace-minecart-push-values.patch
diff --git a/patches/api/0349-More-Projectile-API.patch b/patches/api/0348-More-Projectile-API.patch
similarity index 100%
rename from patches/api/0349-More-Projectile-API.patch
rename to patches/api/0348-More-Projectile-API.patch
diff --git a/patches/api/0350-Add-getComputedBiome-API.patch b/patches/api/0349-Add-getComputedBiome-API.patch
similarity index 100%
rename from patches/api/0350-Add-getComputedBiome-API.patch
rename to patches/api/0349-Add-getComputedBiome-API.patch
diff --git a/patches/api/0351-Add-enchantWithLevels-API.patch b/patches/api/0350-Add-enchantWithLevels-API.patch
similarity index 100%
rename from patches/api/0351-Add-enchantWithLevels-API.patch
rename to patches/api/0350-Add-enchantWithLevels-API.patch
diff --git a/patches/api/0352-Add-TameableDeathMessageEvent.patch b/patches/api/0351-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/api/0352-Add-TameableDeathMessageEvent.patch
rename to patches/api/0351-Add-TameableDeathMessageEvent.patch
diff --git a/patches/api/0353-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/0352-Allow-to-change-the-podium-of-the-EnderDragon.patch
similarity index 100%
rename from patches/api/0353-Allow-to-change-the-podium-of-the-EnderDragon.patch
rename to patches/api/0352-Allow-to-change-the-podium-of-the-EnderDragon.patch
diff --git a/patches/api/0354-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch b/patches/api/0353-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
similarity index 100%
rename from patches/api/0354-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
rename to patches/api/0353-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
diff --git a/patches/api/0355-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/api/0354-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/api/0355-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/api/0354-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/api/0356-WorldCreator-keepSpawnLoaded.patch b/patches/api/0355-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/api/0356-WorldCreator-keepSpawnLoaded.patch
rename to patches/api/0355-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/api/0357-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/api/0356-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 96%
rename from patches/api/0357-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/api/0356-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 9b70c2dc74..8fa20db188 100644
--- a/patches/api/0357-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/api/0356-Add-EntityDyeEvent-and-CollarColorable-interface.patch
@@ -152,10 +152,10 @@ index 0534fbc228f64cf3b361ab097d9b88212bdb0f36..d03adfaa4176617ef2ace2754fe02b63
/**
diff --git a/src/main/java/org/bukkit/entity/Wolf.java b/src/main/java/org/bukkit/entity/Wolf.java
-index 6d5597a8d48ee65a1b54422c7a39a0f5b461b711..84db38388bf7a58e66d6cd29620b4fe64b0a897e 100644
+index 59efc8d5e9bb2bec2e5cff3bf8eaaf01351954d9..0a308ea9bf631b45afa1b13d385e3c64119493ee 100644
--- a/src/main/java/org/bukkit/entity/Wolf.java
+++ b/src/main/java/org/bukkit/entity/Wolf.java
-@@ -6,7 +6,7 @@ import org.jetbrains.annotations.NotNull;
+@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Represents a Wolf
*/
@@ -164,7 +164,7 @@ index 6d5597a8d48ee65a1b54422c7a39a0f5b461b711..84db38388bf7a58e66d6cd29620b4fe6
/**
* Checks if this wolf is angry
-@@ -31,6 +31,7 @@ public interface Wolf extends Tameable, Sittable {
+@@ -34,6 +34,7 @@ public interface Wolf extends Tameable, Sittable {
* @return the color of the collar
*/
@NotNull
@@ -172,7 +172,7 @@ index 6d5597a8d48ee65a1b54422c7a39a0f5b461b711..84db38388bf7a58e66d6cd29620b4fe6
public DyeColor getCollarColor();
/**
-@@ -38,6 +39,7 @@ public interface Wolf extends Tameable, Sittable {
+@@ -41,6 +42,7 @@ public interface Wolf extends Tameable, Sittable {
*
* @param color the color to apply
*/
diff --git a/patches/api/0358-Add-PlayerStopUsingItemEvent.patch b/patches/api/0357-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/api/0358-Add-PlayerStopUsingItemEvent.patch
rename to patches/api/0357-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/api/0359-Expand-FallingBlock-API.patch b/patches/api/0358-Expand-FallingBlock-API.patch
similarity index 93%
rename from patches/api/0359-Expand-FallingBlock-API.patch
rename to patches/api/0358-Expand-FallingBlock-API.patch
index 0f65eb8961..d98776cf63 100644
--- a/patches/api/0359-Expand-FallingBlock-API.patch
+++ b/patches/api/0358-Expand-FallingBlock-API.patch
@@ -10,10 +10,10 @@ Subject: [PATCH] Expand FallingBlock API
Co-authored-by: Lukas Planz
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 7ff0ac9c78c3793791afbfa344a9ced3821d9638..fa81e440ad20ab8740cb073f515d1671dc6ea9a0 100644
+index d7f4a9c634b3a7b2668f296dce108cc6fc3046df..00fbc02a1751902edda327236e51a6991f5366f8 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
-@@ -2270,8 +2270,10 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2282,8 +2282,10 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
* @return The spawned {@link FallingBlock} instance
* @throws IllegalArgumentException if {@link Location} or {@link
* MaterialData} are null or {@link Material} of the {@link MaterialData} is not a block
@@ -24,7 +24,7 @@ index 7ff0ac9c78c3793791afbfa344a9ced3821d9638..fa81e440ad20ab8740cb073f515d1671
public FallingBlock spawnFallingBlock(@NotNull Location location, @NotNull MaterialData data) throws IllegalArgumentException;
/**
-@@ -2284,8 +2286,10 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2296,8 +2298,10 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
* @return The spawned {@link FallingBlock} instance
* @throws IllegalArgumentException if {@link Location} or {@link
* BlockData} are null
@@ -35,7 +35,7 @@ index 7ff0ac9c78c3793791afbfa344a9ced3821d9638..fa81e440ad20ab8740cb073f515d1671
public FallingBlock spawnFallingBlock(@NotNull Location location, @NotNull BlockData data) throws IllegalArgumentException;
/**
-@@ -2302,7 +2306,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2314,7 +2318,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
* @return The spawned {@link FallingBlock} instance
* @throws IllegalArgumentException if {@link Location} or {@link
* Material} are null or {@link Material} is not a block
diff --git a/patches/api/0360-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0359-Add-method-isTickingWorlds-to-Bukkit.patch
similarity index 91%
rename from patches/api/0360-Add-method-isTickingWorlds-to-Bukkit.patch
rename to patches/api/0359-Add-method-isTickingWorlds-to-Bukkit.patch
index 40b7bec1d7..eb982e565a 100644
--- a/patches/api/0360-Add-method-isTickingWorlds-to-Bukkit.patch
+++ b/patches/api/0359-Add-method-isTickingWorlds-to-Bukkit.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add method isTickingWorlds() to Bukkit.
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 22ec7dda6853db6539e98e8d39d8a13be8926f07..a24de4474114af533e1e8b78c4fd0e8c5edd14b8 100644
+index eb6d59bad1e4f0b394290d683f5dfed6ba6dd75b..a2e5e917a7a0f6763f2ac13583dc28d9ea35ca64 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -806,12 +806,26 @@ public final class Bukkit {
+@@ -808,12 +808,26 @@ public final class Bukkit {
return server.getWorlds();
}
@@ -35,7 +35,7 @@ index 22ec7dda6853db6539e98e8d39d8a13be8926f07..a24de4474114af533e1e8b78c4fd0e8c
*
* @param creator the options to use when creating the world
* @return newly created or loaded world
-@@ -823,6 +837,9 @@ public final class Bukkit {
+@@ -825,6 +839,9 @@ public final class Bukkit {
/**
* Unloads a world with the given name.
@@ -45,7 +45,7 @@ index 22ec7dda6853db6539e98e8d39d8a13be8926f07..a24de4474114af533e1e8b78c4fd0e8c
*
* @param name Name of the world to unload
* @param save whether to save the chunks before unloading
-@@ -834,6 +851,9 @@ public final class Bukkit {
+@@ -836,6 +853,9 @@ public final class Bukkit {
/**
* Unloads the given world.
@@ -56,10 +56,10 @@ index 22ec7dda6853db6539e98e8d39d8a13be8926f07..a24de4474114af533e1e8b78c4fd0e8c
* @param world the world to unload
* @param save whether to save the chunks before unloading
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 96f9f3ac492eb6f4628d47f0be4239ab9bc7df54..c8704bc90a4f7040e5fa1c0377d5533bd14a4249 100644
+index 6da6c20b684eba64b85d67db2482b4a968749070..708ea9556510b2e9de2f7f1c381572e3bde540d1 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -673,34 +673,55 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -675,34 +675,55 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
public List getWorlds();
diff --git a/patches/api/0361-Add-WardenAngerChangeEvent.patch b/patches/api/0360-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/api/0361-Add-WardenAngerChangeEvent.patch
rename to patches/api/0360-Add-WardenAngerChangeEvent.patch
diff --git a/patches/api/0362-Nameable-Banner-API.patch b/patches/api/0361-Nameable-Banner-API.patch
similarity index 100%
rename from patches/api/0362-Nameable-Banner-API.patch
rename to patches/api/0361-Nameable-Banner-API.patch
diff --git a/patches/api/0363-Add-Player-getFishHook.patch b/patches/api/0362-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/api/0363-Add-Player-getFishHook.patch
rename to patches/api/0362-Add-Player-getFishHook.patch
diff --git a/patches/api/0364-More-Teleport-API.patch b/patches/api/0363-More-Teleport-API.patch
similarity index 97%
rename from patches/api/0364-More-Teleport-API.patch
rename to patches/api/0363-More-Teleport-API.patch
index 7f4f75ceac..eb36f5ee5d 100644
--- a/patches/api/0364-More-Teleport-API.patch
+++ b/patches/api/0363-More-Teleport-API.patch
@@ -120,7 +120,7 @@ index 0000000000000000000000000000000000000000..c8b5b570d44da9524bfc59c7e11b2ae5
+
+}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 8827defeb26593cb2c2391e505b008f1190b01f3..bc1547381b08d1acbbef885d9c3ecd63f3550426 100644
+index 0cbf946c4f0f47ddfb59b23905968313f25294b1..a2223907c6e6780ca25dae255f321f9add11c912 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -126,10 +126,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -158,10 +158,10 @@ index 8827defeb26593cb2c2391e505b008f1190b01f3..bc1547381b08d1acbbef885d9c3ecd63
* Teleports this entity to the given location. If this entity is riding a
* vehicle, it will be dismounted prior to teleportation.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 2501533048e4de25672d9cc0a52fa1150e6d8adb..d598eb27f131a265c163ea96ab5fb56d4cf6ecb9 100644
+index cd2d59a8a098227ec7725d121a63cc90e2a139fa..25064aafd5871a7168e8a0ba3e87d6de89e2b083 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3424,6 +3424,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3468,6 +3468,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
String getClientBrandName();
// Paper end
diff --git a/patches/api/0365-Add-EntityPortalReadyEvent.patch b/patches/api/0364-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/api/0365-Add-EntityPortalReadyEvent.patch
rename to patches/api/0364-Add-EntityPortalReadyEvent.patch
diff --git a/patches/api/0366-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0365-Custom-Chat-Completion-Suggestions-API.patch
similarity index 91%
rename from patches/api/0366-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/api/0365-Custom-Chat-Completion-Suggestions-API.patch
index 90d9c68dee..e22c1feefa 100644
--- a/patches/api/0366-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/api/0365-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Custom Chat Completion Suggestions API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d598eb27f131a265c163ea96ab5fb56d4cf6ecb9..f7c1b6380389d81ac94005408429ac5bd79f19a6 100644
+index 25064aafd5871a7168e8a0ba3e87d6de89e2b083..ac9227472443ecb819cc7480a217cd78a98a9b35 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3308,6 +3308,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3352,6 +3352,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
void sendOpLevel(byte level);
// Paper end - sendOpLevel API
diff --git a/patches/api/0367-Collision-API.patch b/patches/api/0366-Collision-API.patch
similarity index 93%
rename from patches/api/0367-Collision-API.patch
rename to patches/api/0366-Collision-API.patch
index ced31795fc..f59dc05fbb 100644
--- a/patches/api/0367-Collision-API.patch
+++ b/patches/api/0366-Collision-API.patch
@@ -25,10 +25,10 @@ index 44ee56a5956cc17194c767a0c1071a2abffe818a..43dd6c59cceba12f27e6b265acc3ad97
// Paper end
}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index bc1547381b08d1acbbef885d9c3ecd63f3550426..8e2fa4dba0337a175acfee24fc59423ab4714977 100644
+index a2223907c6e6780ca25dae255f321f9add11c912..11885ef53ed97738d0a50e5f459a9f76c975c085 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1008,4 +1008,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1019,4 +1019,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
boolean isInPowderedSnow();
// Paper end
diff --git a/patches/api/0368-Block-Ticking-API.patch b/patches/api/0367-Block-Ticking-API.patch
similarity index 100%
rename from patches/api/0368-Block-Ticking-API.patch
rename to patches/api/0367-Block-Ticking-API.patch
diff --git a/patches/api/0369-Add-NamespacedKey-biome-methods.patch b/patches/api/0368-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/api/0369-Add-NamespacedKey-biome-methods.patch
rename to patches/api/0368-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/api/0370-Also-load-resources-from-LibraryLoader.patch b/patches/api/0369-Also-load-resources-from-LibraryLoader.patch
similarity index 100%
rename from patches/api/0370-Also-load-resources-from-LibraryLoader.patch
rename to patches/api/0369-Also-load-resources-from-LibraryLoader.patch
diff --git a/patches/api/0371-Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/0370-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/api/0371-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/api/0370-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/api/0372-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0371-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/api/0372-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/api/0371-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/api/0373-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0372-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
similarity index 100%
rename from patches/api/0373-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
rename to patches/api/0372-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
diff --git a/patches/api/0374-Add-getDrops-to-BlockState.patch b/patches/api/0373-Add-getDrops-to-BlockState.patch
similarity index 93%
rename from patches/api/0374-Add-getDrops-to-BlockState.patch
rename to patches/api/0373-Add-getDrops-to-BlockState.patch
index f25ab4169f..f9e8152229 100644
--- a/patches/api/0374-Add-getDrops-to-BlockState.patch
+++ b/patches/api/0373-Add-getDrops-to-BlockState.patch
@@ -7,10 +7,10 @@ Originally added isPreferredTool to BlockData but
upstream added that.
diff --git a/src/main/java/org/bukkit/block/BlockState.java b/src/main/java/org/bukkit/block/BlockState.java
-index c439cf0bb6c50db2b3304c60e50046f096392f9f..19837f0eae67854f48e777bc7d4a13b53fa4b436 100644
+index e573e70d9e74e444783a7363e6cdac126124d86d..80e5d39afe8a6cf882b29c0da78450b958812137 100644
--- a/src/main/java/org/bukkit/block/BlockState.java
+++ b/src/main/java/org/bukkit/block/BlockState.java
-@@ -243,5 +243,41 @@ public interface BlockState extends Metadatable {
+@@ -253,5 +253,41 @@ public interface BlockState extends Metadatable {
* @return true if collidable
*/
boolean isCollidable();
diff --git a/patches/api/0375-Add-PlayerInventorySlotChangeEvent.patch b/patches/api/0374-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/api/0375-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/api/0374-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/api/0376-Elder-Guardian-appearance-API.patch b/patches/api/0375-Elder-Guardian-appearance-API.patch
similarity index 87%
rename from patches/api/0376-Elder-Guardian-appearance-API.patch
rename to patches/api/0375-Elder-Guardian-appearance-API.patch
index ca5e23620f..3490b6d5db 100644
--- a/patches/api/0376-Elder-Guardian-appearance-API.patch
+++ b/patches/api/0375-Elder-Guardian-appearance-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Elder Guardian appearance API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f7c1b6380389d81ac94005408429ac5bd79f19a6..deea445fe7b69d36de61e001f617a837c9a0eb2d 100644
+index ac9227472443ecb819cc7480a217cd78a98a9b35..ad61c664af66a15e214c5db14a5c9e172f5309ae 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3488,6 +3488,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3532,6 +3532,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
void lookAt(@NotNull org.bukkit.entity.Entity entity, @NotNull io.papermc.paper.entity.LookAnchor playerAnchor, @NotNull io.papermc.paper.entity.LookAnchor entityAnchor);
// Paper end - Teleport API
diff --git a/patches/api/0377-Allow-changing-bed-s-occupied-property.patch b/patches/api/0376-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/api/0377-Allow-changing-bed-s-occupied-property.patch
rename to patches/api/0376-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/api/0378-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0377-Add-EquipmentSlot-convenience-methods.patch
similarity index 77%
rename from patches/api/0378-Add-EquipmentSlot-convenience-methods.patch
rename to patches/api/0377-Add-EquipmentSlot-convenience-methods.patch
index 0ef6b4c9b0..64857c2af9 100644
--- a/patches/api/0378-Add-EquipmentSlot-convenience-methods.patch
+++ b/patches/api/0377-Add-EquipmentSlot-convenience-methods.patch
@@ -5,15 +5,14 @@ Subject: [PATCH] Add EquipmentSlot convenience methods
diff --git a/src/main/java/org/bukkit/inventory/EquipmentSlot.java b/src/main/java/org/bukkit/inventory/EquipmentSlot.java
-index 1e7d77118a55ca9db99eabb94894e6ef3409946b..8f793982d0ceeb949422fe3f125fb08229d3266a 100644
+index d776a0c183737efcaf94f0911f3a8c1adc2c5ada..e19e708e9bda10e99c07763d162cb140d0189147 100644
--- a/src/main/java/org/bukkit/inventory/EquipmentSlot.java
+++ b/src/main/java/org/bukkit/inventory/EquipmentSlot.java
-@@ -8,4 +8,28 @@ public enum EquipmentSlot {
- LEGS,
- CHEST,
- HEAD
+@@ -32,4 +32,27 @@ public enum EquipmentSlot {
+ public EquipmentSlotGroup getGroup() {
+ return group;
+ }
+ // Paper start
-+ ;
+ /**
+ * Checks whether this equipment slot is a hand:
+ * either {@link #HAND} or {@link #OFF_HAND}
@@ -28,12 +27,12 @@ index 1e7d77118a55ca9db99eabb94894e6ef3409946b..8f793982d0ceeb949422fe3f125fb082
+ * Checks whether this equipment slot
+ * is one of the armor slots:
+ * {@link #HEAD}, {@link #CHEST},
-+ * {@link #LEGS}, or {@link #FEET}
++ * {@link #LEGS}, {@link #FEET}, or {@link #BODY}
+ *
+ * @return whether this is an armor slot
+ */
+ public boolean isArmor() {
-+ return this == HEAD || this == CHEST || this == LEGS || this == FEET;
++ return this == HEAD || this == CHEST || this == LEGS || this == FEET || this == BODY;
+ }
+ // Paper end
}
diff --git a/patches/api/0379-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0378-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
similarity index 90%
rename from patches/api/0379-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
rename to patches/api/0378-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
index 05a81d55ae..e854d90687 100644
--- a/patches/api/0379-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
+++ b/patches/api/0378-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add LivingEntity#swingHand(EquipmentSlot) convenience method
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index be9fa1b6209a41712767283c6329046ca2795c09..35b0eb94e291dae7a4705fa85b10d23fcd38f49e 100644
+index b5551eed2e9090dcbbe97cae25a0c0545285c64f..1041af2b645e15d8a94fe388cb88f1a8adde16f0 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1329,4 +1329,24 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1331,4 +1331,24 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@Deprecated
void setHurtDirection(float hurtDirection);
// Paper end - hurt direction API
diff --git a/patches/api/0380-Add-entity-knockback-API.patch b/patches/api/0379-Add-entity-knockback-API.patch
similarity index 88%
rename from patches/api/0380-Add-entity-knockback-API.patch
rename to patches/api/0379-Add-entity-knockback-API.patch
index 5d411c2968..1bd8f3077b 100644
--- a/patches/api/0380-Add-entity-knockback-API.patch
+++ b/patches/api/0379-Add-entity-knockback-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add entity knockback API
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 35b0eb94e291dae7a4705fa85b10d23fcd38f49e..41c5559058df9701e345f39d9d3c23e45b6d49c3 100644
+index 1041af2b645e15d8a94fe388cb88f1a8adde16f0..30e87d632d12326c70507b3ec9f464af1fb05650 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1349,4 +1349,18 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1351,4 +1351,18 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
}
}
// Paper end - swing hand API
diff --git a/patches/api/0381-Added-EntityToggleSitEvent.patch b/patches/api/0380-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/api/0381-Added-EntityToggleSitEvent.patch
rename to patches/api/0380-Added-EntityToggleSitEvent.patch
diff --git a/patches/api/0382-Add-Moving-Piston-API.patch b/patches/api/0381-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/api/0382-Add-Moving-Piston-API.patch
rename to patches/api/0381-Add-Moving-Piston-API.patch
diff --git a/patches/api/0383-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0382-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/api/0383-Add-PrePlayerAttackEntityEvent.patch
rename to patches/api/0382-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/api/0384-Add-Player-Warden-Warning-API.patch b/patches/api/0383-Add-Player-Warden-Warning-API.patch
similarity index 93%
rename from patches/api/0384-Add-Player-Warden-Warning-API.patch
rename to patches/api/0383-Add-Player-Warden-Warning-API.patch
index fdc917934f..42426a3ae4 100644
--- a/patches/api/0384-Add-Player-Warden-Warning-API.patch
+++ b/patches/api/0383-Add-Player-Warden-Warning-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Player Warden Warning API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index deea445fe7b69d36de61e001f617a837c9a0eb2d..e855cddf37c453ea3f8f0f4fc21dd2358258e28d 100644
+index ad61c664af66a15e214c5db14a5c9e172f5309ae..537ebbad48191741f666aa2a30c8584562dfcb83 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3504,6 +3504,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3548,6 +3548,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param silent whether sound should be silenced
*/
void showElderGuardian(boolean silent);
diff --git a/patches/api/0385-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0384-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/api/0385-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/api/0384-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/api/0386-Add-paper-dumplisteners-command.patch b/patches/api/0385-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/api/0386-Add-paper-dumplisteners-command.patch
rename to patches/api/0385-Add-paper-dumplisteners-command.patch
diff --git a/patches/api/0387-ItemStack-damage-API.patch b/patches/api/0386-ItemStack-damage-API.patch
similarity index 96%
rename from patches/api/0387-ItemStack-damage-API.patch
rename to patches/api/0386-ItemStack-damage-API.patch
index b7b9d50930..99dcb21b8f 100644
--- a/patches/api/0387-ItemStack-damage-API.patch
+++ b/patches/api/0386-ItemStack-damage-API.patch
@@ -8,10 +8,10 @@ to simulate damage done to an itemstack and all
the logic associated with damaging them
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 41c5559058df9701e345f39d9d3c23e45b6d49c3..812ae3368f828b388d6fd05a94cd88f2d5db9fac 100644
+index 30e87d632d12326c70507b3ec9f464af1fb05650..4f32d5866b06a78d46db15158598d1e2beb377c1 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1363,4 +1363,53 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1365,4 +1365,53 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*/
void knockback(double strength, double directionX, double directionZ);
// Paper end - knockback API
diff --git a/patches/api/0388-Add-Tick-TemporalUnit.patch b/patches/api/0387-Add-Tick-TemporalUnit.patch
similarity index 100%
rename from patches/api/0388-Add-Tick-TemporalUnit.patch
rename to patches/api/0387-Add-Tick-TemporalUnit.patch
diff --git a/patches/api/0389-Friction-API.patch b/patches/api/0388-Friction-API.patch
similarity index 96%
rename from patches/api/0389-Friction-API.patch
rename to patches/api/0388-Friction-API.patch
index 4488bf7b41..fee1e8ce76 100644
--- a/patches/api/0389-Friction-API.patch
+++ b/patches/api/0388-Friction-API.patch
@@ -59,7 +59,7 @@ index ced419f8655bff72f0257b639d5f7d73afe3c2e2..bcc6ba95bd21c7972865838c636a03f5
/**
* Gets the item stack associated with this item drop.
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 812ae3368f828b388d6fd05a94cd88f2d5db9fac..017a743c1445e2c859fef0ef962e656035af12bd 100644
+index 4f32d5866b06a78d46db15158598d1e2beb377c1..951d0960faff8357a42079e10367b2768de835f8 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0390-Player-Entity-Tracking-Events.patch b/patches/api/0389-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/api/0390-Player-Entity-Tracking-Events.patch
rename to patches/api/0389-Player-Entity-Tracking-Events.patch
diff --git a/patches/api/0391-Add-missing-Fluid-type.patch b/patches/api/0390-Add-missing-Fluid-type.patch
similarity index 100%
rename from patches/api/0391-Add-missing-Fluid-type.patch
rename to patches/api/0390-Add-missing-Fluid-type.patch
diff --git a/patches/api/0392-fix-Instruments.patch b/patches/api/0391-fix-Instruments.patch
similarity index 100%
rename from patches/api/0392-fix-Instruments.patch
rename to patches/api/0391-fix-Instruments.patch
diff --git a/patches/api/0393-Add-BlockLockCheckEvent.patch b/patches/api/0392-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/api/0393-Add-BlockLockCheckEvent.patch
rename to patches/api/0392-Add-BlockLockCheckEvent.patch
diff --git a/patches/api/0394-Add-Sneaking-API-for-Entities.patch b/patches/api/0393-Add-Sneaking-API-for-Entities.patch
similarity index 83%
rename from patches/api/0394-Add-Sneaking-API-for-Entities.patch
rename to patches/api/0393-Add-Sneaking-API-for-Entities.patch
index 7c75bb16f2..3f8d4c724f 100644
--- a/patches/api/0394-Add-Sneaking-API-for-Entities.patch
+++ b/patches/api/0393-Add-Sneaking-API-for-Entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Sneaking API for Entities
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 8e2fa4dba0337a175acfee24fc59423ab4714977..2d6f7b2bf4cb23ef43a4dcbab2ecd2a7c7c2809c 100644
+index 11885ef53ed97738d0a50e5f459a9f76c975c085..5a80cf6b16c8fb0457421b7b694a06f43e5e902b 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -819,6 +819,25 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -35,10 +35,10 @@ index 8e2fa4dba0337a175acfee24fc59423ab4714977..2d6f7b2bf4cb23ef43a4dcbab2ecd2a7
* Get the category of spawn to which this entity belongs.
*
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index e855cddf37c453ea3f8f0f4fc21dd2358258e28d..6afced1da637e4162972b0ff1f6c9cf42c256a02 100644
+index 537ebbad48191741f666aa2a30c8584562dfcb83..5e798ea4c66e1a7ce6239b972e6a13810850a438 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -417,6 +417,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -461,6 +461,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* @return true if player is in sneak mode
*/
@@ -46,7 +46,7 @@ index e855cddf37c453ea3f8f0f4fc21dd2358258e28d..6afced1da637e4162972b0ff1f6c9cf4
public boolean isSneaking();
/**
-@@ -424,6 +425,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -468,6 +469,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*
* @param sneak true if player should appear sneaking
*/
diff --git a/patches/api/0395-Improve-PortalEvents.patch b/patches/api/0394-Improve-PortalEvents.patch
similarity index 100%
rename from patches/api/0395-Improve-PortalEvents.patch
rename to patches/api/0394-Improve-PortalEvents.patch
diff --git a/patches/api/0396-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/api/0395-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
similarity index 100%
rename from patches/api/0396-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
rename to patches/api/0395-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/api/0397-Flying-Fall-Damage-API.patch b/patches/api/0396-Flying-Fall-Damage-API.patch
similarity index 88%
rename from patches/api/0397-Flying-Fall-Damage-API.patch
rename to patches/api/0396-Flying-Fall-Damage-API.patch
index 69dcbced37..b38eb93f1c 100644
--- a/patches/api/0397-Flying-Fall-Damage-API.patch
+++ b/patches/api/0396-Flying-Fall-Damage-API.patch
@@ -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 6afced1da637e4162972b0ff1f6c9cf42c256a02..6fc27c35f8533b37d82f0db5605d4d06e70af18b 100644
+index 5e798ea4c66e1a7ce6239b972e6a13810850a438..ce5530c27572fefd732301e07393fab0d9c99afb 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1859,6 +1859,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1903,6 +1903,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void setAllowFlight(boolean flight);
diff --git a/patches/api/0398-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0397-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
similarity index 100%
rename from patches/api/0398-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
rename to patches/api/0397-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
diff --git a/patches/api/0399-Win-Screen-API.patch b/patches/api/0398-Win-Screen-API.patch
similarity index 94%
rename from patches/api/0399-Win-Screen-API.patch
rename to patches/api/0398-Win-Screen-API.patch
index 3741437041..05fbb589d3 100644
--- a/patches/api/0399-Win-Screen-API.patch
+++ b/patches/api/0398-Win-Screen-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Win Screen API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 6fc27c35f8533b37d82f0db5605d4d06e70af18b..0966eb33f0a1cf74a2f2fc3cbb74c756848e2eeb 100644
+index ce5530c27572fefd732301e07393fab0d9c99afb..6dc9a93811d143ed266f0f6235358d58b1e00523 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1205,6 +1205,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1249,6 +1249,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void sendMap(@NotNull MapView map);
diff --git a/patches/api/0400-Add-Entity-Body-Yaw-API.patch b/patches/api/0399-Add-Entity-Body-Yaw-API.patch
similarity index 86%
rename from patches/api/0400-Add-Entity-Body-Yaw-API.patch
rename to patches/api/0399-Add-Entity-Body-Yaw-API.patch
index a34499f0db..b8527349d9 100644
--- a/patches/api/0400-Add-Entity-Body-Yaw-API.patch
+++ b/patches/api/0399-Add-Entity-Body-Yaw-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Entity Body Yaw API
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 2d6f7b2bf4cb23ef43a4dcbab2ecd2a7c7c2809c..0be4107270fb7fdba5c7d0e6f3964d33337f91f0 100644
+index 5a80cf6b16c8fb0457421b7b694a06f43e5e902b..9e7b6ed599759de451429c99bc6876b878c1cca2 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1026,6 +1026,43 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1037,6 +1037,43 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
* @return true if in powdered snow.
*/
boolean isInPowderedSnow();
@@ -53,10 +53,10 @@ index 2d6f7b2bf4cb23ef43a4dcbab2ecd2a7c7c2809c..0be4107270fb7fdba5c7d0e6f3964d33
// Paper start - Collision API
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 017a743c1445e2c859fef0ef962e656035af12bd..b8a9b56c3071d94371ab69b1a72c2e6c0692ab39 100644
+index 951d0960faff8357a42079e10367b2768de835f8..bc577baad70cdea52aeaaf71d2e110286f9f4265 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1412,4 +1412,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1414,4 +1414,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*/
void damageItemStack(org.bukkit.inventory.@NotNull EquipmentSlot slot, int amount);
// Paper end - ItemStack damage API
diff --git a/patches/api/0401-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0400-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
similarity index 100%
rename from patches/api/0401-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
rename to patches/api/0400-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
diff --git a/patches/api/0402-Add-EntityFertilizeEggEvent.patch b/patches/api/0401-Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/api/0402-Add-EntityFertilizeEggEvent.patch
rename to patches/api/0401-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/api/0403-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0402-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/api/0403-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/api/0402-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/api/0404-Add-Shearable-API.patch b/patches/api/0403-Add-Shearable-API.patch
similarity index 100%
rename from patches/api/0404-Add-Shearable-API.patch
rename to patches/api/0403-Add-Shearable-API.patch
diff --git a/patches/api/0405-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/api/0404-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/api/0405-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/api/0404-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/api/0406-Add-Mob-Experience-reward-API.patch b/patches/api/0405-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/api/0406-Add-Mob-Experience-reward-API.patch
rename to patches/api/0405-Add-Mob-Experience-reward-API.patch
diff --git a/patches/api/0407-Expand-PlayerItemMendEvent.patch b/patches/api/0406-Expand-PlayerItemMendEvent.patch
similarity index 100%
rename from patches/api/0407-Expand-PlayerItemMendEvent.patch
rename to patches/api/0406-Expand-PlayerItemMendEvent.patch
diff --git a/patches/api/0408-Add-transient-modifier-API.patch b/patches/api/0407-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/api/0408-Add-transient-modifier-API.patch
rename to patches/api/0407-Add-transient-modifier-API.patch
diff --git a/patches/api/0409-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/api/0408-Properly-remove-the-experimental-smithing-inventory-.patch
similarity index 100%
rename from patches/api/0409-Properly-remove-the-experimental-smithing-inventory-.patch
rename to patches/api/0408-Properly-remove-the-experimental-smithing-inventory-.patch
diff --git a/patches/api/0410-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0409-Add-method-to-remove-all-active-potion-effects.patch
similarity index 91%
rename from patches/api/0410-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/api/0409-Add-method-to-remove-all-active-potion-effects.patch
index 47a9befa74..71e9937870 100644
--- a/patches/api/0410-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/api/0409-Add-method-to-remove-all-active-potion-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index b8a9b56c3071d94371ab69b1a72c2e6c0692ab39..80df95e93b9a919af8c2e98b09b75522ee60eae6 100644
+index bc577baad70cdea52aeaaf71d2e110286f9f4265..4c0c548af4d2eff6fb6b6d11ba94a64db08ccb64 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -657,6 +657,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0411-Folia-scheduler-and-owned-region-API.patch b/patches/api/0410-Folia-scheduler-and-owned-region-API.patch
similarity index 98%
rename from patches/api/0411-Folia-scheduler-and-owned-region-API.patch
rename to patches/api/0410-Folia-scheduler-and-owned-region-API.patch
index 2913858508..05f2626953 100644
--- a/patches/api/0411-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/api/0410-Folia-scheduler-and-owned-region-API.patch
@@ -499,10 +499,10 @@ index 0000000000000000000000000000000000000000..a6b50c9d8af589cc4747e14d343d2045
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index a24de4474114af533e1e8b78c4fd0e8c5edd14b8..010d7e8a831b32060a471ef877ac43ce237a7258 100644
+index a2e5e917a7a0f6763f2ac13583dc28d9ea35ca64..e4f3f621c4c6d2653770c149db71587fc04e0991 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2635,6 +2635,141 @@ public final class Bukkit {
+@@ -2658,6 +2658,141 @@ public final class Bukkit {
}
// Paper end
@@ -645,10 +645,10 @@ index a24de4474114af533e1e8b78c4fd0e8c5edd14b8..010d7e8a831b32060a471ef877ac43ce
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 c8704bc90a4f7040e5fa1c0377d5533bd14a4249..627913905269739e91c5007e372856e321cb9312 100644
+index 708ea9556510b2e9de2f7f1c381572e3bde540d1..63cbc38217865be8f79890a0d8d6143461d344f3 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -2297,4 +2297,119 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2316,4 +2316,119 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
// Paper end
@@ -769,10 +769,10 @@ index c8704bc90a4f7040e5fa1c0377d5533bd14a4249..627913905269739e91c5007e372856e3
+ // Paper end - Folia region threading API
}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 0be4107270fb7fdba5c7d0e6f3964d33337f91f0..c01c3f6576d4c0a8a173080ce01509d3eb678611 100644
+index 9e7b6ed599759de451429c99bc6876b878c1cca2..9a0022f9e77b7e532c0cad9f85620901064e436d 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1086,4 +1086,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1097,4 +1097,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
boolean wouldCollideUsing(@NotNull BoundingBox boundingBox);
// Paper end - Collision API
diff --git a/patches/api/0412-Add-event-for-player-editing-sign.patch b/patches/api/0411-Add-event-for-player-editing-sign.patch
similarity index 100%
rename from patches/api/0412-Add-event-for-player-editing-sign.patch
rename to patches/api/0411-Add-event-for-player-editing-sign.patch
diff --git a/patches/api/0413-Add-Sign-getInteractableSideFor.patch b/patches/api/0412-Add-Sign-getInteractableSideFor.patch
similarity index 100%
rename from patches/api/0413-Add-Sign-getInteractableSideFor.patch
rename to patches/api/0412-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/api/0414-Fix-BanList-API.patch b/patches/api/0413-Fix-BanList-API.patch
similarity index 96%
rename from patches/api/0414-Fix-BanList-API.patch
rename to patches/api/0413-Fix-BanList-API.patch
index 1fb6e9abf8..911f301327 100644
--- a/patches/api/0414-Fix-BanList-API.patch
+++ b/patches/api/0413-Fix-BanList-API.patch
@@ -130,10 +130,10 @@ index e805e629cede1c4c0674282c930cb67852718c3e..5248cf08ef83c7304dd76c42a2f646bb
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0966eb33f0a1cf74a2f2fc3cbb74c756848e2eeb..cc84581276a793bb8c4851ab55591f8251b6403b 100644
+index 6dc9a93811d143ed266f0f6235358d58b1e00523..463521dc80254cab673c5203ee263948081219e9 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -301,7 +301,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -345,7 +345,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* (updated) previous ban
*/
@Nullable
@@ -142,7 +142,7 @@ index 0966eb33f0a1cf74a2f2fc3cbb74c756848e2eeb..cc84581276a793bb8c4851ab55591f82
/**
* Adds this user to the {@link ProfileBanList}. If a previous ban exists, this will
-@@ -317,7 +317,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -361,7 +361,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* (updated) previous ban
*/
@Nullable
@@ -151,7 +151,7 @@ index 0966eb33f0a1cf74a2f2fc3cbb74c756848e2eeb..cc84581276a793bb8c4851ab55591f82
/**
* Adds this user to the {@link ProfileBanList}. If a previous ban exists, this will
-@@ -333,7 +333,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -377,7 +377,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* (updated) previous ban
*/
@Nullable
diff --git a/patches/api/0415-Add-whitelist-events.patch b/patches/api/0414-Add-whitelist-events.patch
similarity index 100%
rename from patches/api/0415-Add-whitelist-events.patch
rename to patches/api/0414-Add-whitelist-events.patch
diff --git a/patches/api/0416-API-for-updating-recipes-on-clients.patch b/patches/api/0415-API-for-updating-recipes-on-clients.patch
similarity index 91%
rename from patches/api/0416-API-for-updating-recipes-on-clients.patch
rename to patches/api/0415-API-for-updating-recipes-on-clients.patch
index 0ab07c3ae5..60f206a340 100644
--- a/patches/api/0416-API-for-updating-recipes-on-clients.patch
+++ b/patches/api/0415-API-for-updating-recipes-on-clients.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] API for updating recipes on clients
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 010d7e8a831b32060a471ef877ac43ce237a7258..0865830a8d9f29dee47c34a192e26e4c1304a12c 100644
+index e4f3f621c4c6d2653770c149db71587fc04e0991..b5455d03761ced30c94719deeee6788d7c6a8fb7 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -990,6 +990,26 @@ public final class Bukkit {
+@@ -992,6 +992,26 @@ public final class Bukkit {
server.reloadData();
}
@@ -35,7 +35,7 @@ index 010d7e8a831b32060a471ef877ac43ce237a7258..0865830a8d9f29dee47c34a192e26e4c
/**
* Returns the primary logger associated with this server instance.
*
-@@ -1050,6 +1070,20 @@ public final class Bukkit {
+@@ -1052,6 +1072,20 @@ public final class Bukkit {
return server.addRecipe(recipe);
}
@@ -56,7 +56,7 @@ index 010d7e8a831b32060a471ef877ac43ce237a7258..0865830a8d9f29dee47c34a192e26e4c
/**
* Get a list of all recipes for a given item. The stack size is ignored
* in comparisons. If the durability is -1, it will match any data value.
-@@ -1241,6 +1275,24 @@ public final class Bukkit {
+@@ -1243,6 +1277,24 @@ public final class Bukkit {
return server.removeRecipe(key);
}
@@ -82,10 +82,10 @@ index 010d7e8a831b32060a471ef877ac43ce237a7258..0865830a8d9f29dee47c34a192e26e4c
* Gets a list of command aliases defined in the server properties.
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 627913905269739e91c5007e372856e321cb9312..bc55bf7361fb41a91766fcb2f1e4620e3db64781 100644
+index 63cbc38217865be8f79890a0d8d6143461d344f3..c0ebbca69775775af22cf2c31b1516e5bf18df4a 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -836,6 +836,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -838,6 +838,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
public void reloadData();
@@ -108,7 +108,7 @@ index 627913905269739e91c5007e372856e321cb9312..bc55bf7361fb41a91766fcb2f1e4620e
/**
* Returns the primary logger associated with this server instance.
*
-@@ -877,15 +893,34 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -879,15 +895,34 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
public boolean dispatchCommand(@NotNull CommandSender sender, @NotNull String commandLine) throws CommandException;
/**
@@ -144,7 +144,7 @@ index 627913905269739e91c5007e372856e321cb9312..bc55bf7361fb41a91766fcb2f1e4620e
/**
* Get a list of all recipes for a given item. The stack size is ignored
* in comparisons. If the durability is -1, it will match any data value.
-@@ -1054,6 +1089,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1056,6 +1091,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
public boolean removeRecipe(@NotNull NamespacedKey key);
diff --git a/patches/api/0417-Add-PlayerFailMoveEvent.patch b/patches/api/0416-Add-PlayerFailMoveEvent.patch
similarity index 100%
rename from patches/api/0417-Add-PlayerFailMoveEvent.patch
rename to patches/api/0416-Add-PlayerFailMoveEvent.patch
diff --git a/patches/api/0418-Fix-custom-statistic-criteria-creation.patch b/patches/api/0417-Fix-custom-statistic-criteria-creation.patch
similarity index 100%
rename from patches/api/0418-Fix-custom-statistic-criteria-creation.patch
rename to patches/api/0417-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/api/0419-SculkCatalyst-bloom-API.patch b/patches/api/0418-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/api/0419-SculkCatalyst-bloom-API.patch
rename to patches/api/0418-SculkCatalyst-bloom-API.patch
diff --git a/patches/api/0420-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0419-API-for-an-entity-s-scoreboard-name.patch
similarity index 88%
rename from patches/api/0420-API-for-an-entity-s-scoreboard-name.patch
rename to patches/api/0419-API-for-an-entity-s-scoreboard-name.patch
index efef8c0b08..9820a1a54f 100644
--- a/patches/api/0420-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/api/0419-API-for-an-entity-s-scoreboard-name.patch
@@ -7,10 +7,10 @@ Was obtainable through different methods, but you had to use different
methods depending on the implementation of Entity you were working with.
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index c01c3f6576d4c0a8a173080ce01509d3eb678611..2a30cda9efb24829f9c6a265e8be2dd848fa7c7c 100644
+index 9a0022f9e77b7e532c0cad9f85620901064e436d..8dcb9f17046ac5dc0301b5d4984b016514e19109 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1097,4 +1097,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1108,4 +1108,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
@NotNull io.papermc.paper.threadedregions.scheduler.EntityScheduler getScheduler();
// Paper end - Folia schedulers
diff --git a/patches/api/0421-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0420-Deprecate-and-replace-methods-with-old-StructureType.patch
similarity index 94%
rename from patches/api/0421-Deprecate-and-replace-methods-with-old-StructureType.patch
rename to patches/api/0420-Deprecate-and-replace-methods-with-old-StructureType.patch
index a32c35bff3..77b0ffe0a4 100644
--- a/patches/api/0421-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/api/0420-Deprecate-and-replace-methods-with-old-StructureType.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 0865830a8d9f29dee47c34a192e26e4c1304a12c..8e2942664f73b0f92beb30c7a94b720610a43c15 100644
+index b5455d03761ced30c94719deeee6788d7c6a8fb7..c9fbbf0287cd663080fc09ac83b439780cbfae85 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -935,9 +935,6 @@ public final class Bukkit {
+@@ -937,9 +937,6 @@ public final class Bukkit {
/**
* Create a new explorer map targeting the closest nearby structure of a
* given {@link StructureType}.
@@ -18,7 +18,7 @@ index 0865830a8d9f29dee47c34a192e26e4c1304a12c..8e2942664f73b0f92beb30c7a94b7206
*
* @param world the world the map will belong to
* @param location the origin location to find the nearest structure
-@@ -946,7 +943,9 @@ public final class Bukkit {
+@@ -948,7 +945,9 @@ public final class Bukkit {
*
* @see World#locateNearestStructure(org.bukkit.Location,
* org.bukkit.StructureType, int, boolean)
@@ -28,7 +28,7 @@ index 0865830a8d9f29dee47c34a192e26e4c1304a12c..8e2942664f73b0f92beb30c7a94b7206
@NotNull
public static ItemStack createExplorerMap(@NotNull World world, @NotNull Location location, @NotNull StructureType structureType) {
return server.createExplorerMap(world, location, structureType);
-@@ -969,11 +968,54 @@ public final class Bukkit {
+@@ -971,11 +970,54 @@ public final class Bukkit {
*
* @see World#locateNearestStructure(org.bukkit.Location,
* org.bukkit.StructureType, int, boolean)
@@ -84,10 +84,10 @@ index 0865830a8d9f29dee47c34a192e26e4c1304a12c..8e2942664f73b0f92beb30c7a94b7206
/**
* Reloads the server, refreshing settings and plugin information.
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index bc55bf7361fb41a91766fcb2f1e4620e3db64781..78daaaa3b4f1ec1d05652287d9f9b08689bc2cbf 100644
+index c0ebbca69775775af22cf2c31b1516e5bf18df4a..c8395c8707e696f1e6fc8b0fd03f07203e01c157 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -800,16 +800,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -802,16 +802,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*
* @see World#locateNearestStructure(org.bukkit.Location,
* org.bukkit.StructureType, int, boolean)
@@ -106,7 +106,7 @@ index bc55bf7361fb41a91766fcb2f1e4620e3db64781..78daaaa3b4f1ec1d05652287d9f9b086
*
* @param world the world the map will belong to
* @param location the origin location to find the nearest structure
-@@ -821,9 +820,50 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -823,9 +822,50 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*
* @see World#locateNearestStructure(org.bukkit.Location,
* org.bukkit.StructureType, int, boolean)
diff --git a/patches/api/0422-Add-Listing-API-for-Player.patch b/patches/api/0421-Add-Listing-API-for-Player.patch
similarity index 89%
rename from patches/api/0422-Add-Listing-API-for-Player.patch
rename to patches/api/0421-Add-Listing-API-for-Player.patch
index 66d1e974c0..94d5892bd0 100644
--- a/patches/api/0422-Add-Listing-API-for-Player.patch
+++ b/patches/api/0421-Add-Listing-API-for-Player.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Listing API for Player
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index cc84581276a793bb8c4851ab55591f8251b6403b..0d6401cd26424c971b137c968467e29f47c03d8b 100644
+index 463521dc80254cab673c5203ee263948081219e9..5753d6d6ae791e2b086c861ddeb6522e46f2571c 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1989,6 +1989,32 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2033,6 +2033,32 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public boolean canSee(@NotNull Entity entity);
diff --git a/patches/api/0423-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/0422-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
similarity index 100%
rename from patches/api/0423-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
rename to patches/api/0422-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/api/0424-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0423-Fix-NPE-on-Boat-getStatus.patch
similarity index 100%
rename from patches/api/0424-Fix-NPE-on-Boat-getStatus.patch
rename to patches/api/0423-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/api/0425-Expand-Pose-API.patch b/patches/api/0424-Expand-Pose-API.patch
similarity index 95%
rename from patches/api/0425-Expand-Pose-API.patch
rename to patches/api/0424-Expand-Pose-API.patch
index 42cbaf8eb9..b6d907acb4 100644
--- a/patches/api/0425-Expand-Pose-API.patch
+++ b/patches/api/0424-Expand-Pose-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand Pose API
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 2a30cda9efb24829f9c6a265e8be2dd848fa7c7c..23def071492ccd715693d534cc506936e18f0f46 100644
+index 8dcb9f17046ac5dc0301b5d4984b016514e19109..62e3793903905b94eb1a120345015149abb33713 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -836,6 +836,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0426-MerchantRecipe-add-copy-constructor.patch b/patches/api/0425-MerchantRecipe-add-copy-constructor.patch
similarity index 100%
rename from patches/api/0426-MerchantRecipe-add-copy-constructor.patch
rename to patches/api/0425-MerchantRecipe-add-copy-constructor.patch
diff --git a/patches/api/0427-More-DragonBattle-API.patch b/patches/api/0426-More-DragonBattle-API.patch
similarity index 100%
rename from patches/api/0427-More-DragonBattle-API.patch
rename to patches/api/0426-More-DragonBattle-API.patch
diff --git a/patches/api/0428-Add-PlayerPickItemEvent.patch b/patches/api/0427-Add-PlayerPickItemEvent.patch
similarity index 100%
rename from patches/api/0428-Add-PlayerPickItemEvent.patch
rename to patches/api/0427-Add-PlayerPickItemEvent.patch
diff --git a/patches/api/0429-Allow-trident-custom-damage.patch b/patches/api/0428-Allow-trident-custom-damage.patch
similarity index 100%
rename from patches/api/0429-Allow-trident-custom-damage.patch
rename to patches/api/0428-Allow-trident-custom-damage.patch
diff --git a/patches/api/0430-Expose-hand-during-BlockCanBuildEvent.patch b/patches/api/0429-Expose-hand-during-BlockCanBuildEvent.patch
similarity index 100%
rename from patches/api/0430-Expose-hand-during-BlockCanBuildEvent.patch
rename to patches/api/0429-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/api/0431-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0430-Limit-setBurnTime-to-valid-short-values.patch
similarity index 100%
rename from patches/api/0431-Limit-setBurnTime-to-valid-short-values.patch
rename to patches/api/0430-Limit-setBurnTime-to-valid-short-values.patch
diff --git a/patches/api/0432-Add-OfflinePlayer-isConnected.patch b/patches/api/0431-Add-OfflinePlayer-isConnected.patch
similarity index 100%
rename from patches/api/0432-Add-OfflinePlayer-isConnected.patch
rename to patches/api/0431-Add-OfflinePlayer-isConnected.patch
diff --git a/patches/api/0433-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/api/0432-Add-titleOverride-to-InventoryOpenEvent.patch
similarity index 100%
rename from patches/api/0433-Add-titleOverride-to-InventoryOpenEvent.patch
rename to patches/api/0432-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/api/0434-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0433-Allow-proper-checking-of-empty-item-stacks.patch
similarity index 100%
rename from patches/api/0434-Allow-proper-checking-of-empty-item-stacks.patch
rename to patches/api/0433-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/api/0435-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/api/0434-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
similarity index 100%
rename from patches/api/0435-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
rename to patches/api/0434-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
diff --git a/patches/api/0436-Add-player-idle-duration-API.patch b/patches/api/0435-Add-player-idle-duration-API.patch
similarity index 89%
rename from patches/api/0436-Add-player-idle-duration-API.patch
rename to patches/api/0435-Add-player-idle-duration-API.patch
index d8f5d40c3c..41b55311ed 100644
--- a/patches/api/0436-Add-player-idle-duration-API.patch
+++ b/patches/api/0435-Add-player-idle-duration-API.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add player idle duration API
Implements API for getting and resetting a player's idle duration.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0d6401cd26424c971b137c968467e29f47c03d8b..0d585390066966f3afd6b88c6d80806292a3cd31 100644
+index 5753d6d6ae791e2b086c861ddeb6522e46f2571c..9261f06e332f8db94b2ef7bc01f5b0e61422bcb2 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3645,6 +3645,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3689,6 +3689,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
void increaseWardenWarningLevel();
// Paper end
diff --git a/patches/api/0437-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0436-Add-API-to-get-the-collision-shape-of-a-block-before.patch
similarity index 100%
rename from patches/api/0437-Add-API-to-get-the-collision-shape-of-a-block-before.patch
rename to patches/api/0436-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/api/0438-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0437-Add-predicate-for-blocks-when-raytracing.patch
similarity index 98%
rename from patches/api/0438-Add-predicate-for-blocks-when-raytracing.patch
rename to patches/api/0437-Add-predicate-for-blocks-when-raytracing.patch
index e03c5e17fa..c212167a42 100644
--- a/patches/api/0438-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/api/0437-Add-predicate-for-blocks-when-raytracing.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add predicate for blocks when raytracing
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index fa81e440ad20ab8740cb073f515d1671dc6ea9a0..377d57b0e603898d309a9384aa8bb9fca97673e3 100644
+index 00fbc02a1751902edda327236e51a6991f5366f8..3abd62dc08e1edaeec6773819c8726671221074a 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1703,6 +1703,27 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0439-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/api/0438-Add-hand-to-fish-event-for-all-player-interactions.patch
similarity index 100%
rename from patches/api/0439-Add-hand-to-fish-event-for-all-player-interactions.patch
rename to patches/api/0438-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/api/0440-Add-UUID-attribute-modifier-API.patch b/patches/api/0439-Add-UUID-attribute-modifier-API.patch
similarity index 100%
rename from patches/api/0440-Add-UUID-attribute-modifier-API.patch
rename to patches/api/0439-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/api/0441-Expand-LingeringPotion-API.patch b/patches/api/0440-Expand-LingeringPotion-API.patch
similarity index 100%
rename from patches/api/0441-Expand-LingeringPotion-API.patch
rename to patches/api/0440-Expand-LingeringPotion-API.patch
diff --git a/patches/api/0442-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0441-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
similarity index 100%
rename from patches/api/0442-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
rename to patches/api/0441-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
diff --git a/patches/api/0443-Add-Structure-check-API.patch b/patches/api/0442-Add-Structure-check-API.patch
similarity index 94%
rename from patches/api/0443-Add-Structure-check-API.patch
rename to patches/api/0442-Add-Structure-check-API.patch
index 00a6416368..4c0756c86e 100644
--- a/patches/api/0443-Add-Structure-check-API.patch
+++ b/patches/api/0442-Add-Structure-check-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Structure check API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 377d57b0e603898d309a9384aa8bb9fca97673e3..35fb5047dd8a8521586a9ca9f8d70881355fb7f5 100644
+index 3abd62dc08e1edaeec6773819c8726671221074a..0e3c7de14be8dc01199fd68b6bf41783c5c43ec3 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -78,6 +78,30 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0444-add-missing-Experimental-annotations.patch b/patches/api/0443-add-missing-Experimental-annotations.patch
similarity index 83%
rename from patches/api/0444-add-missing-Experimental-annotations.patch
rename to patches/api/0443-add-missing-Experimental-annotations.patch
index 714fd8e1a3..fb55944d12 100644
--- a/patches/api/0444-add-missing-Experimental-annotations.patch
+++ b/patches/api/0443-add-missing-Experimental-annotations.patch
@@ -28,10 +28,10 @@ index 5269df59f0e8099a72c6b628ac1b8c84a0d1a5d5..775fda4b299e1d6dba9b293b2f98505e
public static final FeatureFlag UPDATE_121 = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("update_1_21"));
}
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 9f86ad25a57b3f6e6bda1ce657833837cb3b2292..ec117c47401ea1a04beb0e5ee9d4d394db7c5c4e 100644
+index fab8dfb1bd80490f6891687914997cc8580542cd..76ace93e930a80496504f1afc2897bc08bf2a6e5 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
-@@ -144,54 +144,67 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -145,54 +145,67 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
* BlockData: {@link Slab}
*/
@MinecraftExperimental
@@ -99,7 +99,7 @@ index 9f86ad25a57b3f6e6bda1ce657833837cb3b2292..ec117c47401ea1a04beb0e5ee9d4d394
CHISELED_TUFF_BRICKS(8601),
DRIPSTONE_BLOCK(26227),
/**
-@@ -305,12 +318,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -311,12 +324,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
WEATHERED_COPPER(19699),
OXIDIZED_COPPER(19490),
@MinecraftExperimental
@@ -116,7 +116,7 @@ index 9f86ad25a57b3f6e6bda1ce657833837cb3b2292..ec117c47401ea1a04beb0e5ee9d4d394
OXIDIZED_CHISELED_COPPER(27719),
CUT_COPPER(32519),
EXPOSED_CUT_COPPER(18000),
-@@ -353,12 +370,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -359,12 +376,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
WAXED_WEATHERED_COPPER(5960),
WAXED_OXIDIZED_COPPER(25626),
@MinecraftExperimental
@@ -133,7 +133,7 @@ index 9f86ad25a57b3f6e6bda1ce657833837cb3b2292..ec117c47401ea1a04beb0e5ee9d4d394
WAXED_OXIDIZED_CHISELED_COPPER(7735),
WAXED_CUT_COPPER(11030),
WAXED_EXPOSED_CUT_COPPER(30043),
-@@ -2100,41 +2121,49 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -2106,41 +2127,49 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
* BlockData: {@link Door}
*/
@MinecraftExperimental
@@ -183,7 +183,7 @@ index 9f86ad25a57b3f6e6bda1ce657833837cb3b2292..ec117c47401ea1a04beb0e5ee9d4d394
WAXED_OXIDIZED_COPPER_DOOR(23888, Door.class),
/**
* BlockData: {@link TrapDoor}
-@@ -2188,41 +2217,49 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -2194,41 +2223,49 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
* BlockData: {@link TrapDoor}
*/
@MinecraftExperimental
@@ -233,7 +233,7 @@ index 9f86ad25a57b3f6e6bda1ce657833837cb3b2292..ec117c47401ea1a04beb0e5ee9d4d394
WAXED_OXIDIZED_COPPER_TRAPDOOR(21450, TrapDoor.class),
/**
* BlockData: {@link Gate}
-@@ -2522,6 +2559,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -2530,6 +2567,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
EGG(21603, 16),
COMPASS(24139),
RECOVERY_COMPASS(12710),
@@ -242,7 +242,7 @@ index 9f86ad25a57b3f6e6bda1ce657833837cb3b2292..ec117c47401ea1a04beb0e5ee9d4d394
BUNDLE(16835, 1),
FISHING_ROD(4167, 1, 64),
CLOCK(14980),
-@@ -2628,6 +2667,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -2636,6 +2675,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
* BlockData: {@link Crafter}
*/
@MinecraftExperimental
@@ -250,15 +250,18 @@ index 9f86ad25a57b3f6e6bda1ce657833837cb3b2292..ec117c47401ea1a04beb0e5ee9d4d394
CRAFTER(25243, Crafter.class),
FILLED_MAP(23504),
SHEARS(27971, 1, 238),
-@@ -2667,6 +2707,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -2676,8 +2716,10 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
BEE_SPAWN_EGG(22924),
BLAZE_SPAWN_EGG(4759),
@MinecraftExperimental
++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+ BOGGED_SPAWN_EGG(12042),
+ @MinecraftExperimental
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
BREEZE_SPAWN_EGG(7580),
CAT_SPAWN_EGG(29583),
CAMEL_SPAWN_EGG(14760),
-@@ -3162,88 +3203,106 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -3189,88 +3231,106 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
* BlockData: {@link Waterlogged}
*/
@MinecraftExperimental
@@ -363,13 +366,13 @@ index 9f86ad25a57b3f6e6bda1ce657833837cb3b2292..ec117c47401ea1a04beb0e5ee9d4d394
@MinecraftExperimental
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
TRIAL_KEY(12725),
- /**
- * BlockData: {@link Levelled}
+ @MinecraftExperimental
+ OMINOUS_TRIAL_KEY(4986),
diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
-index 0cb15350704955f4a1aeff184a8b60d9a9871ded..594de70f30e292748935f5b1e43a5a7d76bb8ca0 100644
+index 690cf2aedf558396a71b20ba2b8ce737c61dfe43..13fc04abacd36af8755ec0061f4b652f1719d3e5 100644
--- a/src/main/java/org/bukkit/Particle.java
+++ b/src/main/java/org/bukkit/Particle.java
-@@ -136,12 +136,16 @@ public enum Particle implements Keyed {
+@@ -129,14 +129,19 @@ public enum Particle implements Keyed {
DUST_PLUME("dust_plume"),
WHITE_SMOKE("white_smoke"),
@MinecraftExperimental
@@ -377,20 +380,23 @@ index 0cb15350704955f4a1aeff184a8b60d9a9871ded..594de70f30e292748935f5b1e43a5a7d
GUST("gust"),
@MinecraftExperimental
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
- GUST_EMITTER("gust_emitter"),
+ SMALL_GUST("small_gust"),
@MinecraftExperimental
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
- GUST_DUST("gust_dust"),
+ GUST_EMITTER_LARGE("gust_emitter_large"),
+ @MinecraftExperimental
++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+ GUST_EMITTER_SMALL("gust_emitter_small"),
@MinecraftExperimental
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
TRIAL_SPAWNER_DETECTION("trial_spawner_detection"),
- /**
- * Uses {@link BlockData} as DataType
+ @MinecraftExperimental
+ TRIAL_SPAWNER_DETECTION_OMINOUS("trial_spawner_detection_ominous"),
diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
-index 72ea6ddd00eed73459d700d657929f83ba1ca7ee..bb1b6bc9349af6dec369420035e860921da52589 100644
+index ddc4c5097214371108dc945371e1d28811352c38..5a4a1beee97f14d287787353fa2c942175093134 100644
--- a/src/main/java/org/bukkit/Sound.java
+++ b/src/main/java/org/bukkit/Sound.java
-@@ -215,40 +215,56 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
+@@ -220,40 +220,56 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
BLOCK_CONDUIT_DEACTIVATE("block.conduit.deactivate"),
BLOCK_COPPER_BREAK("block.copper.break"),
@MinecraftExperimental
@@ -447,7 +453,7 @@ index 72ea6ddd00eed73459d700d657929f83ba1ca7ee..bb1b6bc9349af6dec369420035e86092
BLOCK_COPPER_TRAPDOOR_OPEN("block.copper_trapdoor.open"),
BLOCK_CORAL_BLOCK_BREAK("block.coral_block.break"),
BLOCK_CORAL_BLOCK_FALL("block.coral_block.fall"),
-@@ -531,14 +547,19 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
+@@ -546,14 +562,19 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
BLOCK_POLISHED_DEEPSLATE_PLACE("block.polished_deepslate.place"),
BLOCK_POLISHED_DEEPSLATE_STEP("block.polished_deepslate.step"),
@MinecraftExperimental
@@ -467,16 +473,21 @@ index 72ea6ddd00eed73459d700d657929f83ba1ca7ee..bb1b6bc9349af6dec369420035e86092
BLOCK_POLISHED_TUFF_STEP("block.polished_tuff.step"),
BLOCK_PORTAL_AMBIENT("block.portal.ambient"),
BLOCK_PORTAL_TRAVEL("block.portal.travel"),
-@@ -684,26 +705,37 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
- BLOCK_SWEET_BERRY_BUSH_PICK_BERRIES("block.sweet_berry_bush.pick_berries"),
- BLOCK_SWEET_BERRY_BUSH_PLACE("block.sweet_berry_bush.place"),
+@@ -701,34 +722,46 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
+ @MinecraftExperimental
+ BLOCK_TRIAL_SPAWNER_ABOUT_TO_SPAWN_ITEM("block.trial_spawner.about_to_spawn_item"),
@MinecraftExperimental
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
BLOCK_TRIAL_SPAWNER_AMBIENT("block.trial_spawner.ambient"),
@MinecraftExperimental
+ BLOCK_TRIAL_SPAWNER_AMBIENT_CHARGED("block.trial_spawner.ambient_charged"),
+ @MinecraftExperimental
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
BLOCK_TRIAL_SPAWNER_BREAK("block.trial_spawner.break"),
@MinecraftExperimental
++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+ BLOCK_TRIAL_SPAWNER_CHARGE_ACTIVATE("block.trial_spawner.charge_activate"),
+ @MinecraftExperimental
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
BLOCK_TRIAL_SPAWNER_CLOSE_SHUTTER("block.trial_spawner.close_shutter"),
@MinecraftExperimental
@@ -498,6 +509,10 @@ index 72ea6ddd00eed73459d700d657929f83ba1ca7ee..bb1b6bc9349af6dec369420035e86092
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
BLOCK_TRIAL_SPAWNER_PLACE("block.trial_spawner.place"),
@MinecraftExperimental
+ BLOCK_TRIAL_SPAWNER_SPAWN_ITEM("block.trial_spawner.spawn_item"),
+ @MinecraftExperimental
+ BLOCK_TRIAL_SPAWNER_SPAWN_ITEM_BEGIN("block.trial_spawner.spawn_item_begin"),
+ @MinecraftExperimental
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
BLOCK_TRIAL_SPAWNER_SPAWN_MOB("block.trial_spawner.spawn_mob"),
@MinecraftExperimental
@@ -505,7 +520,7 @@ index 72ea6ddd00eed73459d700d657929f83ba1ca7ee..bb1b6bc9349af6dec369420035e86092
BLOCK_TRIAL_SPAWNER_STEP("block.trial_spawner.step"),
BLOCK_TRIPWIRE_ATTACH("block.tripwire.attach"),
BLOCK_TRIPWIRE_CLICK_OFF("block.tripwire.click_off"),
-@@ -711,14 +743,19 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
+@@ -736,14 +769,19 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
BLOCK_TRIPWIRE_DETACH("block.tripwire.detach"),
BLOCK_TUFF_BREAK("block.tuff.break"),
@MinecraftExperimental
@@ -525,13 +540,33 @@ index 72ea6ddd00eed73459d700d657929f83ba1ca7ee..bb1b6bc9349af6dec369420035e86092
BLOCK_TUFF_BRICKS_STEP("block.tuff_bricks.step"),
BLOCK_TUFF_FALL("block.tuff.fall"),
BLOCK_TUFF_HIT("block.tuff.hit"),
-@@ -809,22 +846,31 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
+@@ -874,36 +912,51 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
ENTITY_BOAT_PADDLE_LAND("entity.boat.paddle_land"),
ENTITY_BOAT_PADDLE_WATER("entity.boat.paddle_water"),
@MinecraftExperimental
++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+ ENTITY_BOGGED_AMBIENT("entity.bogged.ambient"),
+ @MinecraftExperimental
++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+ ENTITY_BOGGED_DEATH("entity.bogged.death"),
+ @MinecraftExperimental
++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+ ENTITY_BOGGED_HURT("entity.bogged.hurt"),
+ @MinecraftExperimental
++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+ ENTITY_BOGGED_SHEAR("entity.bogged.shear"),
+ @MinecraftExperimental
++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+ ENTITY_BOGGED_STEP("entity.bogged.step"),
+ @MinecraftExperimental
++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+ ENTITY_BREEZE_CHARGE("entity.breeze.charge"),
+ @MinecraftExperimental
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
ENTITY_BREEZE_DEATH("entity.breeze.death"),
@MinecraftExperimental
+ ENTITY_BREEZE_DEFLECT("entity.breeze.deflect"),
+ @MinecraftExperimental
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
ENTITY_BREEZE_HURT("entity.breeze.hurt"),
@MinecraftExperimental
@@ -555,25 +590,17 @@ index 72ea6ddd00eed73459d700d657929f83ba1ca7ee..bb1b6bc9349af6dec369420035e86092
@MinecraftExperimental
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
ENTITY_BREEZE_SLIDE("entity.breeze.slide"),
- ENTITY_CAMEL_AMBIENT("entity.camel.ambient"),
- ENTITY_CAMEL_DASH("entity.camel.dash"),
-@@ -971,6 +1017,7 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
- ENTITY_GENERIC_SPLASH("entity.generic.splash"),
- ENTITY_GENERIC_SWIM("entity.generic.swim"),
@MinecraftExperimental
-+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
- ENTITY_GENERIC_WIND_BURST("entity.generic.wind_burst"),
- ENTITY_GHAST_AMBIENT("entity.ghast.ambient"),
- ENTITY_GHAST_DEATH("entity.ghast.death"),
-@@ -1124,6 +1171,7 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
- ENTITY_PARROT_HURT("entity.parrot.hurt"),
- ENTITY_PARROT_IMITATE_BLAZE("entity.parrot.imitate.blaze"),
+ ENTITY_BREEZE_WHIRL("entity.breeze.whirl"),
+@@ -1209,6 +1262,7 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
+ @MinecraftExperimental
+ ENTITY_PARROT_IMITATE_BOGGED("entity.parrot.imitate.bogged"),
@MinecraftExperimental
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
ENTITY_PARROT_IMITATE_BREEZE("entity.parrot.imitate.breeze"),
ENTITY_PARROT_IMITATE_CREEPER("entity.parrot.imitate.creeper"),
ENTITY_PARROT_IMITATE_DROWNED("entity.parrot.imitate.drowned"),
-@@ -1494,10 +1542,13 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
+@@ -1591,10 +1645,13 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
ITEM_BUCKET_FILL_POWDER_SNOW("item.bucket.fill_powder_snow"),
ITEM_BUCKET_FILL_TADPOLE("item.bucket.fill_tadpole"),
@MinecraftExperimental
@@ -588,27 +615,25 @@ index 72ea6ddd00eed73459d700d657929f83ba1ca7ee..bb1b6bc9349af6dec369420035e86092
ITEM_CHORUS_FRUIT_TELEPORT("item.chorus_fruit.teleport"),
ITEM_CROP_PLANT("item.crop.plant"),
diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index dd509bd1f7e80a04a63d2ba6eca1ff845d12fb2d..8ca9c7c8d0d6138c825d765c270c29bce11fe09e 100644
+index cb5890e0e7bccfee2ba32dd4776f1ae1fdd539e8..7f1dc4288c2d324281e11dc582b6f4ef54bde632 100644
--- a/src/main/java/org/bukkit/Tag.java
+++ b/src/main/java/org/bukkit/Tag.java
-@@ -973,14 +973,17 @@ public interface Tag extends Keyed {
+@@ -1234,6 +1234,7 @@ public interface Tag extends Keyed {
+ /**
+ * Vanilla tag representing entities which deflect projectiles.
+ */
++ @org.jetbrains.annotations.ApiStatus.Experimental @MinecraftExperimental // Paper - add missing annotation
+ Tag ENTITY_TYPES_DEFLECTS_PROJECTILES = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("deflects_projectiles"), EntityType.class);
/**
* Vanilla tag representing entities which deflect arrows.
- */
-+ @org.jetbrains.annotations.ApiStatus.Experimental @MinecraftExperimental // Paper - add missing annotation
- Tag ENTITY_TYPES_DEFLECTS_ARROWS = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("deflects_arrows"), EntityType.class);
- /**
- * Vanilla tag representing entities which deflect tridents.
- */
-+ @org.jetbrains.annotations.ApiStatus.Experimental @MinecraftExperimental // Paper - add missing annotation
- Tag ENTITY_TYPES_DEFLECTS_TRIDENTS = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("deflects_tridents"), EntityType.class);
+@@ -1244,6 +1245,7 @@ public interface Tag extends Keyed {
/**
* Vanilla tag representing entities which can turn in boats.
*/
+ @org.jetbrains.annotations.ApiStatus.Experimental @MinecraftExperimental // Paper - add missing annotation
Tag ENTITY_TYPES_CAN_TURN_IN_BOATS = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("can_turn_in_boats"), EntityType.class);
-
- // Paper start
+ /**
+ * Vanilla tag representing all entities sensitive to illager enchantments.
diff --git a/src/main/java/org/bukkit/generator/structure/Structure.java b/src/main/java/org/bukkit/generator/structure/Structure.java
index 65d3d8fd5f00114dc388d65321a9affe1b32ce20..8e39f282c771ddafe5d890dcf065c56f0c633647 100644
--- a/src/main/java/org/bukkit/generator/structure/Structure.java
@@ -622,16 +647,37 @@ index 65d3d8fd5f00114dc388d65321a9affe1b32ce20..8e39f282c771ddafe5d890dcf065c56f
private static Structure getStructure(String name) {
diff --git a/src/main/java/org/bukkit/loot/LootTables.java b/src/main/java/org/bukkit/loot/LootTables.java
-index fe1af164da1e27f413a66acf2856d35bd2f72b6c..0cbdeb044beeef59285f5d6ed8782aa8b46e80d9 100644
+index 0a3bce3b9d27e6a978e0c40d9f16afb8b2e14e9b..a29b4e72de9d9d605a227c3cf66fc9f180750d27 100644
--- a/src/main/java/org/bukkit/loot/LootTables.java
+++ b/src/main/java/org/bukkit/loot/LootTables.java
-@@ -35,24 +35,34 @@ public enum LootTables implements Keyed {
+@@ -35,38 +35,55 @@ public enum LootTables implements Keyed {
ANCIENT_CITY_ICE_BOX("chests/ancient_city_ice_box"),
RUINED_PORTAL("chests/ruined_portal"),
@MinecraftExperimental
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
TRIAL_CHAMBERS_REWARD("chests/trial_chambers/reward"),
@MinecraftExperimental
++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+ TRIAL_CHAMBERS_REWARD_COMMON("chests/trial_chambers/reward_common"),
+ @MinecraftExperimental
++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+ TRIAL_CHAMBERS_REWARD_RARE("chests/trial_chambers/reward_rare"),
+ @MinecraftExperimental
++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+ TRIAL_CHAMBERS_REWARD_UNIQUE("chests/trial_chambers/reward_unique"),
+ @MinecraftExperimental
++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+ TRIAL_CHAMBERS_REWARD_OMINOUS("chests/trial_chambers/reward_ominous"),
+ @MinecraftExperimental
++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+ TRIAL_CHAMBERS_REWARD_OMINOUS_COMMON("chests/trial_chambers/reward_ominous_common"),
+ @MinecraftExperimental
++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+ TRIAL_CHAMBERS_REWARD_OMINOUS_RARE("chests/trial_chambers/reward_ominous_rare"),
+ @MinecraftExperimental
++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
+ TRIAL_CHAMBERS_REWARD_OMINOUS_UNIQUE("chests/trial_chambers/reward_ominous_unique"),
+ @MinecraftExperimental
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
TRIAL_CHAMBERS_SUPPLY("chests/trial_chambers/supply"),
@MinecraftExperimental
@@ -658,9 +704,9 @@ index fe1af164da1e27f413a66acf2856d35bd2f72b6c..0cbdeb044beeef59285f5d6ed8782aa8
@MinecraftExperimental
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
TRIAL_CHAMBERS_CORRIDOR_POT("pots/trial_chambers/corridor"),
- SHIPWRECK_MAP("chests/shipwreck_map"),
- SHIPWRECK_SUPPLY("chests/shipwreck_supply"),
-@@ -180,8 +190,10 @@ public enum LootTables implements Keyed {
+ @MinecraftExperimental
+ EQUIPMENT_TRIAL_CHAMBER("equipment/trial_chamber"),
+@@ -201,8 +218,10 @@ public enum LootTables implements Keyed {
PIGLIN_BARTERING("gameplay/piglin_bartering"),
// Spawners
@MinecraftExperimental
@@ -669,5 +715,5 @@ index fe1af164da1e27f413a66acf2856d35bd2f72b6c..0cbdeb044beeef59285f5d6ed8782aa8
@MinecraftExperimental
+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
TRIAL_CHAMBER_CONSUMABLES("spawners/trial_chamber/consumables"),
- // Archaeology
- DESERT_WELL_ARCHAEOLOGY("archaeology/desert_well"),
+ @MinecraftExperimental
+ OMINOUS_TRIAL_CHAMBER_KEY("spawners/ominous/trial_chamber/key"),
diff --git a/patches/api/0445-Add-more-scoreboard-API.patch b/patches/api/0444-Add-more-scoreboard-API.patch
similarity index 100%
rename from patches/api/0445-Add-more-scoreboard-API.patch
rename to patches/api/0444-Add-more-scoreboard-API.patch
diff --git a/patches/api/0446-Improve-Registry.patch b/patches/api/0445-Improve-Registry.patch
similarity index 91%
rename from patches/api/0446-Improve-Registry.patch
rename to patches/api/0445-Improve-Registry.patch
index 43e30a4477..bb36e1435d 100644
--- a/patches/api/0446-Improve-Registry.patch
+++ b/patches/api/0445-Improve-Registry.patch
@@ -10,7 +10,7 @@ getKey() methods on Keyed objects that have a registry
are marked as Deprecated or Obsolete.
diff --git a/src/main/java/org/bukkit/MusicInstrument.java b/src/main/java/org/bukkit/MusicInstrument.java
-index ee5368372e136541eafe1d7ffb395de670fe4843..31a81ac909976492f0c6b93ad49008878a3bcae2 100644
+index 62d2b3f950860dee0898d77b0a29635c3f9a7e23..704dba92f9246ef398ed8d162ebee3cf305960e1 100644
--- a/src/main/java/org/bukkit/MusicInstrument.java
+++ b/src/main/java/org/bukkit/MusicInstrument.java
@@ -53,6 +53,16 @@ public abstract class MusicInstrument implements Keyed, net.kyori.adventure.tran
@@ -31,10 +31,10 @@ index ee5368372e136541eafe1d7ffb395de670fe4843..31a81ac909976492f0c6b93ad4900887
@Override
public @NotNull String translationKey() {
diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java
-index 18c672f3855a329bf8f87a9de81b677e8e360b41..e1fb4d8cca6a9c59047b1396f5c40bea957d777a 100644
+index ff870d18f3870d1432167516b166cece075d77bc..0b578ac7646db0a1afd7a04a77280c977a298826 100644
--- a/src/main/java/org/bukkit/Registry.java
+++ b/src/main/java/org/bukkit/Registry.java
-@@ -313,6 +313,49 @@ public interface Registry extends Iterable {
+@@ -328,6 +328,49 @@ public interface Registry extends Iterable {
@Nullable
T get(@NotNull NamespacedKey key);
@@ -84,7 +84,7 @@ index 18c672f3855a329bf8f87a9de81b677e8e360b41..e1fb4d8cca6a9c59047b1396f5c40bea
/**
* Returns a new stream, which contains all registry items, which are registered to the registry.
*
-@@ -379,5 +422,12 @@ public interface Registry extends Iterable {
+@@ -394,5 +437,12 @@ public interface Registry extends Iterable {
public Iterator iterator() {
return map.values().iterator();
}
@@ -98,10 +98,10 @@ index 18c672f3855a329bf8f87a9de81b677e8e360b41..e1fb4d8cca6a9c59047b1396f5c40bea
}
}
diff --git a/src/main/java/org/bukkit/block/banner/PatternType.java b/src/main/java/org/bukkit/block/banner/PatternType.java
-index 1c5c6303de815dd4ffa68f47dd2b6fa187fd4b70..7cdcc70d1bc33c88b217638725713e9cde450bdb 100644
+index 0d250d0c1381aadab031f102f537422a731b88e1..31751aa31ef31142c37ef522a17435f4eeb7231a 100644
--- a/src/main/java/org/bukkit/block/banner/PatternType.java
+++ b/src/main/java/org/bukkit/block/banner/PatternType.java
-@@ -67,6 +67,13 @@ public enum PatternType implements Keyed {
+@@ -72,6 +72,13 @@ public enum PatternType implements Keyed {
this.key = NamespacedKey.minecraft(key);
}
@@ -153,10 +153,10 @@ index 941fac4eee338870d8c30cb1f64cab572cf54548..74816d6da4d7c8d2fa8a7b93fdc4bf29
+ // Paper end - Registry#getKey
}
diff --git a/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java b/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java
-index 3fa087d09c7c2d864eea25659951a537359c9589..31554cfa01360b0f92336617a75f313e0175af7a 100644
+index f2242ddc4085f7e7cdd748d860857822e3d9b007..087e99ed281c0b282d91345067bfca80762faa0b 100644
--- a/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java
+++ b/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java
-@@ -92,4 +92,14 @@ public interface TrimPattern extends Keyed, Translatable {
+@@ -100,4 +100,14 @@ public interface TrimPattern extends Keyed, Translatable {
@Deprecated(forRemoval = true)
@org.jetbrains.annotations.NotNull String getTranslationKey();
// Paper end - adventure
diff --git a/patches/api/0447-Add-experience-points-API.patch b/patches/api/0446-Add-experience-points-API.patch
similarity index 93%
rename from patches/api/0447-Add-experience-points-API.patch
rename to patches/api/0446-Add-experience-points-API.patch
index 3dcd7df05d..a0add5e837 100644
--- a/patches/api/0447-Add-experience-points-API.patch
+++ b/patches/api/0446-Add-experience-points-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add experience points API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0d585390066966f3afd6b88c6d80806292a3cd31..c6cb4f17469a8f2e60dd3e28d41402851ce5fb21 100644
+index 9261f06e332f8db94b2ef7bc01f5b0e61422bcb2..f08b1a2ec8815efcaaf1371e20eb1461a5f2d359 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1858,6 +1858,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1902,6 +1902,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param exp New total experience points
*/
public void setTotalExperience(int exp);
diff --git a/patches/api/0448-Add-missing-InventoryType.patch b/patches/api/0447-Add-missing-InventoryType.patch
similarity index 100%
rename from patches/api/0448-Add-missing-InventoryType.patch
rename to patches/api/0447-Add-missing-InventoryType.patch
diff --git a/patches/api/0449-Add-drops-to-shear-events.patch b/patches/api/0448-Add-drops-to-shear-events.patch
similarity index 100%
rename from patches/api/0449-Add-drops-to-shear-events.patch
rename to patches/api/0448-Add-drops-to-shear-events.patch
diff --git a/patches/api/0450-Add-HiddenPotionEffect-API.patch b/patches/api/0449-Add-HiddenPotionEffect-API.patch
similarity index 98%
rename from patches/api/0450-Add-HiddenPotionEffect-API.patch
rename to patches/api/0449-Add-HiddenPotionEffect-API.patch
index 53d4b040a2..39363e9c3f 100644
--- a/patches/api/0450-Add-HiddenPotionEffect-API.patch
+++ b/patches/api/0449-Add-HiddenPotionEffect-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add HiddenPotionEffect API
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 80df95e93b9a919af8c2e98b09b75522ee60eae6..65112eae8b92344796850b1e4c89e75443eab2fe 100644
+index 4c0c548af4d2eff6fb6b6d11ba94a64db08ccb64..9a5873120e263d77d84183d1909e672f2b303a74 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -591,6 +591,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0451-Add-PlayerShieldDisableEvent.patch b/patches/api/0450-Add-PlayerShieldDisableEvent.patch
similarity index 100%
rename from patches/api/0451-Add-PlayerShieldDisableEvent.patch
rename to patches/api/0450-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/api/0452-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0451-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
similarity index 100%
rename from patches/api/0452-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
rename to patches/api/0451-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
diff --git a/patches/api/0453-Add-BlockStateMeta-clearBlockState.patch b/patches/api/0452-Add-BlockStateMeta-clearBlockState.patch
similarity index 100%
rename from patches/api/0453-Add-BlockStateMeta-clearBlockState.patch
rename to patches/api/0452-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/api/0454-Expose-LootTable-of-DecoratedPot.patch b/patches/api/0453-Expose-LootTable-of-DecoratedPot.patch
similarity index 100%
rename from patches/api/0454-Expose-LootTable-of-DecoratedPot.patch
rename to patches/api/0453-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/api/0455-Add-ShulkerDuplicateEvent.patch b/patches/api/0454-Add-ShulkerDuplicateEvent.patch
similarity index 100%
rename from patches/api/0455-Add-ShulkerDuplicateEvent.patch
rename to patches/api/0454-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/api/0456-Add-api-for-spawn-egg-texture-colors.patch b/patches/api/0455-Add-api-for-spawn-egg-texture-colors.patch
similarity index 100%
rename from patches/api/0456-Add-api-for-spawn-egg-texture-colors.patch
rename to patches/api/0455-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/api/0457-Add-Lifecycle-Event-system.patch b/patches/api/0456-Add-Lifecycle-Event-system.patch
similarity index 100%
rename from patches/api/0457-Add-Lifecycle-Event-system.patch
rename to patches/api/0456-Add-Lifecycle-Event-system.patch
diff --git a/patches/api/0459-ItemStack-Tooltip-API.patch b/patches/api/0457-ItemStack-Tooltip-API.patch
similarity index 100%
rename from patches/api/0459-ItemStack-Tooltip-API.patch
rename to patches/api/0457-ItemStack-Tooltip-API.patch
diff --git a/patches/api/0460-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/api/0458-Add-getChunkSnapshot-includeLightData-parameter.patch
similarity index 100%
rename from patches/api/0460-Add-getChunkSnapshot-includeLightData-parameter.patch
rename to patches/api/0458-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/api/0458-Conduit-API.patch b/patches/api/0458-Conduit-API.patch
deleted file mode 100644
index 57f43f96a3..0000000000
--- a/patches/api/0458-Conduit-API.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tamion <70228790+notTamion@users.noreply.github.com>
-Date: Sat, 27 Jan 2024 20:46:29 +0100
-Subject: [PATCH] Conduit API
-
-
-diff --git a/src/main/java/org/bukkit/block/Conduit.java b/src/main/java/org/bukkit/block/Conduit.java
-index 5543165536e84503c2d1476ee2001468cbb724f9..b3eec2eab586072598a40375a1c3e722ee3fa352 100644
---- a/src/main/java/org/bukkit/block/Conduit.java
-+++ b/src/main/java/org/bukkit/block/Conduit.java
-@@ -3,4 +3,34 @@ package org.bukkit.block;
- /**
- * Represents a captured state of a conduit.
- */
--public interface Conduit extends TileState { }
-+public interface Conduit extends TileState {
-+
-+ // Paper start - Conduit API
-+
-+ /**
-+ * Gets if the conduit is currently active.
-+ *
-+ * Requires the conduit to be placed in the world.
-+ *
-+ * @return if the conduit is active
-+ */
-+ boolean isActive();
-+
-+ /**
-+ * Gets the range in which the Conduit Power effect gets added to players.
-+ *
-+ * Requires the conduit to be placed in the world.
-+ *
-+ * @return the range
-+ */
-+ int getRange();
-+
-+ /**
-+ * Gets the current target of the conduit.
-+ *
-+ * @return the current target
-+ */
-+ @org.jetbrains.annotations.Nullable
-+ org.bukkit.entity.LivingEntity getTarget();
-+ // Paper end - Conduit API
-+}
diff --git a/patches/api/0461-Add-FluidState-API.patch b/patches/api/0459-Add-FluidState-API.patch
similarity index 100%
rename from patches/api/0461-Add-FluidState-API.patch
rename to patches/api/0459-Add-FluidState-API.patch
diff --git a/patches/api/0462-add-number-format-api.patch b/patches/api/0460-add-number-format-api.patch
similarity index 100%
rename from patches/api/0462-add-number-format-api.patch
rename to patches/api/0460-add-number-format-api.patch
diff --git a/patches/api/0463-improve-BanList-types.patch b/patches/api/0461-improve-BanList-types.patch
similarity index 93%
rename from patches/api/0463-improve-BanList-types.patch
rename to patches/api/0461-improve-BanList-types.patch
index f1738e1190..2236f8bf3e 100644
--- a/patches/api/0463-improve-BanList-types.patch
+++ b/patches/api/0461-improve-BanList-types.patch
@@ -68,10 +68,10 @@ index a77c0411a68a9bad33ddfb335b7a996a843e478c..0e0baadde9e34d28db56dc68e66aaf66
/**
* Banned player names
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 8e2942664f73b0f92beb30c7a94b720610a43c15..9a428153f34291bdc026a71f7e60e285b7794b0c 100644
+index c9fbbf0287cd663080fc09ac83b439780cbfae85..687bd8f54c9bfb5f5ab1f7ad9d232daf2433cc76 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1639,11 +1639,27 @@ public final class Bukkit {
+@@ -1651,11 +1651,27 @@ public final class Bukkit {
* @param The ban target
*
* @return a ban list of the specified type
@@ -100,10 +100,10 @@ index 8e2942664f73b0f92beb30c7a94b720610a43c15..9a428153f34291bdc026a71f7e60e285
/**
* Gets a set containing all player operators.
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 78daaaa3b4f1ec1d05652287d9f9b08689bc2cbf..4ff1b38eb65f97344257204cf018f176f247ed36 100644
+index c8395c8707e696f1e6fc8b0fd03f07203e01c157..27084402cf0e46dcd171074629b7c4156e48aa44 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
-@@ -1400,10 +1400,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1410,10 +1410,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @param The ban target
*
* @return a ban list of the specified type
diff --git a/patches/api/0464-Suspicious-Effect-Entry-API.patch b/patches/api/0462-Suspicious-Effect-Entry-API.patch
similarity index 100%
rename from patches/api/0464-Suspicious-Effect-Entry-API.patch
rename to patches/api/0462-Suspicious-Effect-Entry-API.patch
diff --git a/patches/api/0465-Fix-DamageSource-API.patch b/patches/api/0463-Fix-DamageSource-API.patch
similarity index 100%
rename from patches/api/0465-Fix-DamageSource-API.patch
rename to patches/api/0463-Fix-DamageSource-API.patch
diff --git a/patches/api/0466-Expanded-Hopper-API.patch b/patches/api/0464-Expanded-Hopper-API.patch
similarity index 100%
rename from patches/api/0466-Expanded-Hopper-API.patch
rename to patches/api/0464-Expanded-Hopper-API.patch
diff --git a/patches/api/0467-Clone-mutables-to-prevent-unexpected-issues.patch b/patches/api/0465-Clone-mutables-to-prevent-unexpected-issues.patch
similarity index 100%
rename from patches/api/0467-Clone-mutables-to-prevent-unexpected-issues.patch
rename to patches/api/0465-Clone-mutables-to-prevent-unexpected-issues.patch
diff --git a/patches/api/0468-Add-BlockBreakProgressUpdateEvent.patch b/patches/api/0466-Add-BlockBreakProgressUpdateEvent.patch
similarity index 100%
rename from patches/api/0468-Add-BlockBreakProgressUpdateEvent.patch
rename to patches/api/0466-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/api/0469-Deprecate-ItemStack-setType.patch b/patches/api/0467-Deprecate-ItemStack-setType.patch
similarity index 100%
rename from patches/api/0469-Deprecate-ItemStack-setType.patch
rename to patches/api/0467-Deprecate-ItemStack-setType.patch
diff --git a/patches/api/0470-Item-Mutation-Fixes.patch b/patches/api/0468-Item-Mutation-Fixes.patch
similarity index 100%
rename from patches/api/0470-Item-Mutation-Fixes.patch
rename to patches/api/0468-Item-Mutation-Fixes.patch
diff --git a/patches/api/0471-API-for-checking-sent-chunks.patch b/patches/api/0469-API-for-checking-sent-chunks.patch
similarity index 93%
rename from patches/api/0471-API-for-checking-sent-chunks.patch
rename to patches/api/0469-API-for-checking-sent-chunks.patch
index 30170f4dfe..8d97e181b0 100644
--- a/patches/api/0471-API-for-checking-sent-chunks.patch
+++ b/patches/api/0469-API-for-checking-sent-chunks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] API for checking sent chunks
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index c6cb4f17469a8f2e60dd3e28d41402851ce5fb21..d048ae07cc33fd77d128cc1ebf88b0804969fa3c 100644
+index f08b1a2ec8815efcaaf1371e20eb1461a5f2d359..8a1e39474af88188f2e1765731b57d349f0ee645 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3707,6 +3707,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3751,6 +3751,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
void resetIdleDuration();
// Paper end
diff --git a/patches/api/0472-Add-CartographyItemEvent.patch b/patches/api/0470-Add-CartographyItemEvent.patch
similarity index 100%
rename from patches/api/0472-Add-CartographyItemEvent.patch
rename to patches/api/0470-Add-CartographyItemEvent.patch
diff --git a/patches/api/0473-More-Raid-API.patch b/patches/api/0471-More-Raid-API.patch
similarity index 91%
rename from patches/api/0473-More-Raid-API.patch
rename to patches/api/0471-More-Raid-API.patch
index 6c0e5da000..921bc9c6fb 100644
--- a/patches/api/0473-More-Raid-API.patch
+++ b/patches/api/0471-More-Raid-API.patch
@@ -39,10 +39,10 @@ index 983a8c20a06d2b509602b27f49c090598b8ecc42..fa98599e3eee37bf68f0e9813497c718
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 35fb5047dd8a8521586a9ca9f8d70881355fb7f5..e6f66d70d024cf4f0536a5bf8e51bf7b306335df 100644
+index 0e3c7de14be8dc01199fd68b6bf41783c5c43ec3..97f97ea5c6aa513c439f86a9c82821e0f7d9cd1e 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
-@@ -4199,6 +4199,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4215,6 +4215,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@Nullable
public Raid locateNearestRaid(@NotNull Location location, int radius);
diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch
index 62a6510820..a140c8cb77 100644
--- a/patches/server/0001-Setup-Gradle-project.patch
+++ b/patches/server/0001-Setup-Gradle-project.patch
@@ -28,7 +28,7 @@ index 37dab9e868dbfb019c271a547d975a48ad1cb571..3811c0d849a3eb028ed1a6b7a2d4747f
+/.factorypath
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
-index 0000000000000000000000000000000000000000..4e0b810bd0a9991d10e13920f47f0b6d0a56f6aa
+index 0000000000000000000000000000000000000000..8116ef8a1d098f0fe4fab661f913132ce3ec4ae9
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,141 @@
@@ -43,13 +43,13 @@ index 0000000000000000000000000000000000000000..4e0b810bd0a9991d10e13920f47f0b6d
+dependencies {
+ implementation(project(":paper-api"))
+ implementation("jline:jline:2.12.1")
-+ implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") {
++ implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") {
+ exclude(group = "org.apache.logging.log4j", module = "log4j-api")
+ }
+ implementation("org.ow2.asm:asm-commons:9.7")
+ implementation("commons-lang:commons-lang:2.6")
-+ runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1")
-+ runtimeOnly("com.mysql:mysql-connector-j:8.2.0")
++ runtimeOnly("org.xerial:sqlite-jdbc:3.45.3.0")
++ runtimeOnly("com.mysql:mysql-connector-j:8.3.0")
+
+ runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
@@ -61,7 +61,7 @@ index 0000000000000000000000000000000000000000..4e0b810bd0a9991d10e13920f47f0b6d
+ testImplementation("org.ow2.asm:asm-tree:9.7")
+}
+
-+val craftbukkitPackageVersion = "1_20_R3" // Paper
++val craftbukkitPackageVersion = "1_20_R4" // Paper
+tasks.jar {
+ archiveClassifier.set("dev")
+
@@ -175,17 +175,17 @@ index 0000000000000000000000000000000000000000..4e0b810bd0a9991d10e13920f47f0b6d
+}
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
-index 226b56846562846d1b89c54b67b4ccc235eaf3e9..0000000000000000000000000000000000000000
+index ca5ed64db9554831442170c57e288941454dcbca..0000000000000000000000000000000000000000
--- a/pom.xml
+++ /dev/null
-@@ -1,608 +0,0 @@
+@@ -1,613 +0,0 @@
-
- 4.0.0
- org.spigotmc
- spigot
- jar
-- 1.20.4-R0.1-SNAPSHOT
+- 1.20.5-R0.1-SNAPSHOT
- Spigot
- https://www.spigotmc.org/
-
@@ -201,9 +201,8 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
- UTF-8
- unknown
- git
-- 1_20_R3
-- 17
-- 17
+- 1_20_R4
+- 21
-
-
-
@@ -236,7 +235,7 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
-
- org.apache.logging.log4j
- log4j-iostreams
-- 2.19.0
+- 2.22.1
- compile
-
-
@@ -249,13 +248,13 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
-
- com.github.oshi
- oshi-core
-- 6.4.5
+- 6.4.10
- compile
-
-
- com.mojang
- authlib
-- 5.0.51
+- 6.0.54
- compile
-
-
@@ -267,19 +266,19 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
-
- com.mojang
- datafixerupper
-- 6.0.8
+- 7.0.14
- compile
-
-
- com.mojang
- logging
-- 1.1.1
+- 1.2.7
- compile
-
-
- commons-io
- commons-io
-- 2.13.0
+- 2.15.1
- compile
-
-
@@ -353,13 +352,13 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
-
- net.java.dev.jna
- jna
-- 5.13.0
+- 5.14.0
- compile
-
-
- net.java.dev.jna
- jna-platform
-- 5.13.0
+- 5.14.0
- compile
-
-
@@ -371,25 +370,31 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
-
- org.apache.commons
- commons-lang3
-- 3.13.0
+- 3.14.0
- compile
-
-
- org.apache.logging.log4j
- log4j-core
-- 2.19.0
+- 2.22.1
- compile
-
-
- org.apache.logging.log4j
- log4j-slf4j2-impl
-- 2.19.0
+- 2.22.1
- compile
-
-
- org.slf4j
- slf4j-api
-- 2.0.7
+- 2.0.9
+- compile
+-
+-
+- org.lz4
+- lz4-java
+- 1.8.0
- compile
-
-
@@ -415,13 +420,13 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
-
- org.xerial
- sqlite-jdbc
-- 3.42.0.1
+- 3.45.3.0
- runtime
-
-
- com.mysql
- mysql-connector-j
-- 8.2.0
+- 8.3.0
- runtime
-
-
@@ -673,7 +678,7 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
-
- org.apache.maven.plugins
- maven-compiler-plugin
-- 3.11.0
+- 3.13.0
-
-
- eclipse
@@ -684,7 +689,7 @@ index 226b56846562846d1b89c54b67b4ccc235eaf3e9..00000000000000000000000000000000
-
- org.codehaus.plexus
- plexus-compiler-eclipse
-- 2.13.0
+- 2.15.0
-
-
-
diff --git a/patches/server/0002-Remap-fixes.patch b/patches/server/0002-Remap-fixes.patch
index 9a1f203f9a..1c0c07fc21 100644
--- a/patches/server/0002-Remap-fixes.patch
+++ b/patches/server/0002-Remap-fixes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Remap fixes
diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
-index 17a400bb1710afe0b2c88ba7b0a008d4dbcbfa0c..1a4cab0b9995b733aa84b89129009a99177eee9b 100644
+index f0a764d3e1a756537b8188e9f5361d0dbaca25a9..478d2114fbd5c499a8adbf8b6cefcc8335e830dc 100644
--- a/src/main/java/net/minecraft/core/BlockPos.java
+++ b/src/main/java/net/minecraft/core/BlockPos.java
-@@ -289,9 +289,11 @@ public class BlockPos extends Vec3i {
+@@ -311,9 +311,11 @@ public class BlockPos extends Vec3i {
public static Iterable withinManhattan(BlockPos center, int rangeX, int rangeY, int rangeZ) {
int i = rangeX + rangeY + rangeZ;
@@ -23,7 +23,7 @@ index 17a400bb1710afe0b2c88ba7b0a008d4dbcbfa0c..1a4cab0b9995b733aa84b89129009a99
return () -> new AbstractIterator() {
private final BlockPos.MutableBlockPos cursor = new BlockPos.MutableBlockPos();
private int currentDepth;
-@@ -305,7 +307,7 @@ public class BlockPos extends Vec3i {
+@@ -327,7 +329,7 @@ public class BlockPos extends Vec3i {
protected BlockPos computeNext() {
if (this.zMirror) {
this.zMirror = false;
@@ -32,7 +32,7 @@ index 17a400bb1710afe0b2c88ba7b0a008d4dbcbfa0c..1a4cab0b9995b733aa84b89129009a99
return this.cursor;
} else {
BlockPos blockPos;
-@@ -331,7 +333,7 @@ public class BlockPos extends Vec3i {
+@@ -353,7 +355,7 @@ public class BlockPos extends Vec3i {
int k = this.currentDepth - Math.abs(i) - Math.abs(j);
if (k <= rangeZ) {
this.zMirror = k != 0;
@@ -42,10 +42,10 @@ index 17a400bb1710afe0b2c88ba7b0a008d4dbcbfa0c..1a4cab0b9995b733aa84b89129009a99
}
diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java b/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
-index 1915b138ea89790ef8b7456b7fddcbd5d97e5444..ba9f6d288d8773f275e35a9513f7f59ad3f666c0 100644
+index 7344cff32fa6fe3dedb74ed98126072c55b0abd2..d98b28e9488a5a7736719cf656736bb026ec8c7e 100644
--- a/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
-@@ -173,11 +173,11 @@ public class BehaviorUtils {
+@@ -169,10 +169,10 @@ public class BehaviorUtils {
return optional.map((uuid) -> {
return ((ServerLevel) entity.level()).getEntity(uuid);
@@ -53,31 +53,16 @@ index 1915b138ea89790ef8b7456b7fddcbd5d97e5444..ba9f6d288d8773f275e35a9513f7f59a
+ }).map((entity1) -> { // Paper - remap fix
LivingEntity entityliving1;
-- if (entity instanceof LivingEntity) {
-- LivingEntity entityliving2 = (LivingEntity) entity;
-+ if (entity1 instanceof LivingEntity) { // Paper - remap fix
-+ LivingEntity entityliving2 = (LivingEntity) entity1; // Paper - remap fix
-
+- if (entity instanceof LivingEntity entityliving2) {
++ if (entity1 instanceof LivingEntity entityliving2) { // Paper - remap fix
entityliving1 = entityliving2;
} else {
-diff --git a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
-index 17c42cfcec69385f0b65e2d42d735e8b8f6e7b04..04adc10f24f96804a5cb14e884224bb672360464 100644
---- a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
-+++ b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
-@@ -193,7 +193,7 @@ public class RecipeManager extends SimpleJsonResourceReloadListener {
- Builder> builder = ImmutableMap.builder();
-
- recipes.forEach((recipeholder) -> {
-- Map> map1 = (Map) map.computeIfAbsent(recipeholder.value().getType(), (recipes) -> {
-+ Map> map1 = (Map) map.computeIfAbsent(recipeholder.value().getType(), (recipes_) -> { // Paper - remap fix
- return new Object2ObjectLinkedOpenHashMap<>(); // CraftBukkit
- });
- ResourceLocation minecraftkey = recipeholder.id();
+ entityliving1 = null;
diff --git a/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java b/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java
-index 95a5ce711150c4c999a9d17f28a497f034638610..214215d203892b8009595539f25ce26e8752debd 100644
+index 61592d57c26c359abda266f4ac8c58419e9beb02..83fce6746aaa3b378da6c5573ec9991d8438b071 100644
--- a/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java
+++ b/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java
-@@ -251,8 +251,8 @@ public class LootTable {
+@@ -255,8 +255,8 @@ public class LootTable {
public static class Builder implements FunctionUserBuilder {
@@ -119,15 +104,15 @@ index b70450722da13bc4d358a70d3d1d2f30a2cca2b9..86d86c292bdeeb7f42685691287c3b4b
}
}
diff --git a/src/test/java/org/bukkit/ParticleTest.java b/src/test/java/org/bukkit/ParticleTest.java
-index 1edc58410316eaf45858db56897179587e8b22ee..cf6f34e506570e7bb9624c5899fbcdd762d8e0c4 100644
+index 9c9f5dd2351b3067b54d6cc5bdb572c46b12aaa8..307e8a3694c6f0b48d2df9792c3e5fdbaae1fd8e 100644
--- a/src/test/java/org/bukkit/ParticleTest.java
+++ b/src/test/java/org/bukkit/ParticleTest.java
-@@ -231,7 +231,7 @@ public class ParticleTest extends AbstractTestingBase {
+@@ -250,7 +250,7 @@ public class ParticleTest extends AbstractTestingBase {
Check in CraftParticle if the conversion is still correct.
""", bukkit.getKey()));
-- DataResult encoded = assertDoesNotThrow(() -> minecraft.codec().encodeStart(DynamicOpsNBT.INSTANCE, particleParam),
-+ DataResult encoded = assertDoesNotThrow(() -> minecraft.codec().encodeStart(NbtOps.INSTANCE, particleParam), // Paper - remap fix
+- DataResult encoded = assertDoesNotThrow(() -> minecraft.codec().codec().encodeStart(DynamicOpsNBT.INSTANCE, particleParam),
++ DataResult encoded = assertDoesNotThrow(() -> minecraft.codec().codec().encodeStart(NbtOps.INSTANCE, particleParam), // Paper - remap fix
String.format("""
Could not encoded particle param for particle %s.
This can indicated, that the wrong particle param is created in CraftParticle.
@@ -187,7 +172,7 @@ index 5818bfa69a8573a2a8f350066f829d587cbc546b..8e421a1bee0c526e3024eab9ba4cc0b3
assertNotNull(bukkit, "Bukkit gene null for " + gene);
diff --git a/src/test/java/org/bukkit/registry/RegistryConstantsTest.java b/src/test/java/org/bukkit/registry/RegistryConstantsTest.java
-index 8abeb88d1514d22b5095153f9537317006f39df0..82a1efcb3aaaceaf12ad21559dec6b5112fcb361 100644
+index f3de891458ea190e1d608511b5984ca25b06b74c..1b1e55f70b3c9f922bd1cc63209816f50d7d29d1 100644
--- a/src/test/java/org/bukkit/registry/RegistryConstantsTest.java
+++ b/src/test/java/org/bukkit/registry/RegistryConstantsTest.java
@@ -28,17 +28,17 @@ public class RegistryConstantsTest extends AbstractTestingBase {
@@ -212,10 +197,10 @@ index 8abeb88d1514d22b5095153f9537317006f39df0..82a1efcb3aaaceaf12ad21559dec6b51
for (Field field : clazz.getFields()) {
diff --git a/src/test/java/org/bukkit/registry/RegistryLoadOrderTest.java b/src/test/java/org/bukkit/registry/RegistryLoadOrderTest.java
-index b60b07f15fc61b9a92850b2008e2c928b94dbd04..da3eed6f130903bf27eed7e0bcae672a4f860c17 100644
+index 7d332ecf7905f71de106fe0e5fb4cc3e16bd6035..d7ef3a9a545d5278832b864bca683796b1fd0d42 100644
--- a/src/test/java/org/bukkit/registry/RegistryLoadOrderTest.java
+++ b/src/test/java/org/bukkit/registry/RegistryLoadOrderTest.java
-@@ -22,7 +22,7 @@ public class RegistryLoadOrderTest extends AbstractTestingBase {
+@@ -24,7 +24,7 @@ public class RegistryLoadOrderTest extends AbstractTestingBase {
private static boolean initInterface = false;
private static boolean initAbstract = false;
diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch
index c935af1a00..51692ff801 100644
--- a/patches/server/0003-Build-system-changes.patch
+++ b/patches/server/0003-Build-system-changes.patch
@@ -9,20 +9,20 @@ public net.minecraft.server.packs.VanillaPackResourcesBuilder safeGetPath(Ljava/
Co-authored-by: Jake Potrebic
diff --git a/build.gradle.kts b/build.gradle.kts
-index 4e0b810bd0a9991d10e13920f47f0b6d0a56f6aa..50d9182a4845564cd62b026700a7d0517c25e74d 100644
+index 8116ef8a1d098f0fe4fab661f913132ce3ec4ae9..2905c7273ed4d62a7f1bc7eab9ae919ee6c012de 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,9 +9,7 @@ plugins {
dependencies {
implementation(project(":paper-api"))
implementation("jline:jline:2.12.1")
-- implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") {
+- implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") {
- exclude(group = "org.apache.logging.log4j", module = "log4j-api")
- }
-+ implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
++ implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion
implementation("org.ow2.asm:asm-commons:9.7")
implementation("commons-lang:commons-lang:2.6")
- runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.1")
+ runtimeOnly("org.xerial:sqlite-jdbc:3.45.3.0")
@@ -36,6 +34,7 @@ tasks.jar {
val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
@@ -66,10 +66,10 @@ index 4e0b810bd0a9991d10e13920f47f0b6d0a56f6aa..50d9182a4845564cd62b026700a7d051
+ jvmArgs("-DPaper.pushPaperAssetsRoot=true")
}
diff --git a/src/main/java/net/minecraft/resources/ResourceLocation.java b/src/main/java/net/minecraft/resources/ResourceLocation.java
-index 0064a1112f392379ff095f95738f1368240ca4cf..aed74e471126a8a66046a181973158d7d288d3f0 100644
+index 0e93817621bad5d69cf0f9f839d033c47c861457..0ad6d9d417193248f6a9df67f1d1a66cef3ff122 100644
--- a/src/main/java/net/minecraft/resources/ResourceLocation.java
+++ b/src/main/java/net/minecraft/resources/ResourceLocation.java
-@@ -28,6 +28,7 @@ public class ResourceLocation implements Comparable {
+@@ -32,6 +32,7 @@ public class ResourceLocation implements Comparable {
public static final char NAMESPACE_SEPARATOR = ':';
public static final String DEFAULT_NAMESPACE = "minecraft";
public static final String REALMS_NAMESPACE = "realms";
@@ -78,7 +78,7 @@ index 0064a1112f392379ff095f95738f1368240ca4cf..aed74e471126a8a66046a181973158d7
private final String path;
diff --git a/src/main/java/net/minecraft/server/packs/VanillaPackResourcesBuilder.java b/src/main/java/net/minecraft/server/packs/VanillaPackResourcesBuilder.java
-index 6a11d33eb44e0fde731b54a9200eb44b20a73c43..29ab3aae87de2bf14b31268239d935e49cb0fa98 100644
+index 14fc03563daea531314c7ceba56dbb47884010ee..fcf95958ef659c7aa8e28026961fa1d6a5f8b28c 100644
--- a/src/main/java/net/minecraft/server/packs/VanillaPackResourcesBuilder.java
+++ b/src/main/java/net/minecraft/server/packs/VanillaPackResourcesBuilder.java
@@ -138,6 +138,15 @@ public class VanillaPackResourcesBuilder {
@@ -98,10 +98,10 @@ index 6a11d33eb44e0fde731b54a9200eb44b20a73c43..29ab3aae87de2bf14b31268239d935e4
}
diff --git a/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java b/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java
-index dd5e32e7a64eaddab66905dba2595f2220706adb..439b9bc95ae8580fcde89f86565df39ba4040d59 100644
+index a5e8713bc0fefae455b666ebf13c9529e7ba94e6..407254c779c8291543873fe4e94c5f94981a81eb 100644
--- a/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java
+++ b/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java
-@@ -38,7 +38,7 @@ public class ServerPacksSource extends BuiltInPackSource {
+@@ -48,7 +48,7 @@ public class ServerPacksSource extends BuiltInPackSource {
public static VanillaPackResources createVanillaPackSource() {
return new VanillaPackResourcesBuilder()
.setMetadata(BUILT_IN_METADATA)
@@ -109,12 +109,12 @@ index dd5e32e7a64eaddab66905dba2595f2220706adb..439b9bc95ae8580fcde89f86565df39b
+ .exposeNamespace("minecraft", ResourceLocation.PAPER_NAMESPACE) // Paper
.applyDevelopmentConfig()
.pushJarResources()
- .build();
+ .build(VANILLA_PACK_INFO);
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 2930f37c663a1824a2d38df8e4b679aa6adbd870..67d347741db1c5a9a6568ee084388a59e35b16ea 100644
+index 5595eb892fa868508c45448942da65d7c11d49fd..4b8602b168f9dd386aa72b4e5d189c441c93542e 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -209,7 +209,7 @@ public class Main {
+@@ -210,7 +210,7 @@ public class Main {
}
if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
@@ -122,7 +122,7 @@ index 2930f37c663a1824a2d38df8e4b679aa6adbd870..67d347741db1c5a9a6568ee084388a59
+ Date buildDate = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z").parse(Main.class.getPackage().getImplementationVendor()); // Paper
Calendar deadline = Calendar.getInstance();
- deadline.add(Calendar.DAY_OF_YEAR, -28);
+ deadline.add(Calendar.DAY_OF_YEAR, -3);
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
index 93046379d0cefd5d3236fc59e698809acdc18f80..774556a62eb240da42e84db4502e2ed43495be17 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
@@ -140,7 +140,7 @@ diff --git a/src/main/resources/data/.paperassetsroot b/src/main/resources/data/
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/test/java/org/bukkit/support/AbstractTestingBase.java b/src/test/java/org/bukkit/support/AbstractTestingBase.java
-index a1c2c702cc6b5d949df62b5ecf4cc62b8e4e8f77..0619361adf57fdc41c4ecb09d1d6a5c862a85f89 100644
+index 1bdf0b2b8f8e6dace403695fece80ebb3dc9e039..544307fe34cbcfa286a7d7b30900ebea127d189e 100644
--- a/src/test/java/org/bukkit/support/AbstractTestingBase.java
+++ b/src/test/java/org/bukkit/support/AbstractTestingBase.java
@@ -43,6 +43,7 @@ public abstract class AbstractTestingBase {
diff --git a/patches/server/0004-Test-changes.patch b/patches/unapplied/server/0004-Test-changes.patch
similarity index 100%
rename from patches/server/0004-Test-changes.patch
rename to patches/unapplied/server/0004-Test-changes.patch
diff --git a/patches/server/0005-Paper-config-files.patch b/patches/unapplied/server/0005-Paper-config-files.patch
similarity index 100%
rename from patches/server/0005-Paper-config-files.patch
rename to patches/unapplied/server/0005-Paper-config-files.patch
diff --git a/patches/server/0006-MC-Dev-fixes.patch b/patches/unapplied/server/0006-MC-Dev-fixes.patch
similarity index 100%
rename from patches/server/0006-MC-Dev-fixes.patch
rename to patches/unapplied/server/0006-MC-Dev-fixes.patch
diff --git a/patches/server/0007-ConcurrentUtil.patch b/patches/unapplied/server/0007-ConcurrentUtil.patch
similarity index 100%
rename from patches/server/0007-ConcurrentUtil.patch
rename to patches/unapplied/server/0007-ConcurrentUtil.patch
diff --git a/patches/server/0008-CB-fixes.patch b/patches/unapplied/server/0008-CB-fixes.patch
similarity index 99%
rename from patches/server/0008-CB-fixes.patch
rename to patches/unapplied/server/0008-CB-fixes.patch
index 98a115c15e..5557dcf6f3 100644
--- a/patches/server/0008-CB-fixes.patch
+++ b/patches/unapplied/server/0008-CB-fixes.patch
@@ -52,7 +52,7 @@ index b2f37e3caf305f7f2c19c59848717bf73bd2ef5d..87c8460324ff2d2a14e1404fcfa3adb2
@Override
diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java b/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
-index 8fa222759b8ada1674a7d3ae1c0cdf91bfd7f915..da919ad85ce06572f8e7e4c121a2c222f975c7f5 100644
+index 3f5bedc49f249888cf435f5511f5ce1da921910b..a63eaec77251a7f6660d17d7210c639b71751c45 100644
--- a/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
+++ b/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
@@ -42,7 +42,7 @@ public class StructureCheck {
diff --git a/patches/server/0009-MC-Utils.patch b/patches/unapplied/server/0009-MC-Utils.patch
similarity index 100%
rename from patches/server/0009-MC-Utils.patch
rename to patches/unapplied/server/0009-MC-Utils.patch
diff --git a/patches/server/0010-Adventure.patch b/patches/unapplied/server/0010-Adventure.patch
similarity index 100%
rename from patches/server/0010-Adventure.patch
rename to patches/unapplied/server/0010-Adventure.patch
diff --git a/patches/server/0011-Paper-command.patch b/patches/unapplied/server/0011-Paper-command.patch
similarity index 100%
rename from patches/server/0011-Paper-command.patch
rename to patches/unapplied/server/0011-Paper-command.patch
diff --git a/patches/server/0012-Paper-Metrics.patch b/patches/unapplied/server/0012-Paper-Metrics.patch
similarity index 100%
rename from patches/server/0012-Paper-Metrics.patch
rename to patches/unapplied/server/0012-Paper-Metrics.patch
diff --git a/patches/server/0013-Paper-Plugins.patch b/patches/unapplied/server/0013-Paper-Plugins.patch
similarity index 99%
rename from patches/server/0013-Paper-Plugins.patch
rename to patches/unapplied/server/0013-Paper-Plugins.patch
index 24c7946f56..3b9673ae92 100644
--- a/patches/server/0013-Paper-Plugins.patch
+++ b/patches/unapplied/server/0013-Paper-Plugins.patch
@@ -7117,7 +7117,7 @@ index f7114d5b8f2f93f62883e24da29afaf9f74ee1a6..8bf0630c0e06950cd99b7ae9898137f7
return foundFrame.orElse(null);
diff --git a/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java b/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java
-index d14613f7d37198276c251e73703b060a971fac28..e741062f0c9c114db47124031c6fa6a6e145a5cd 100644
+index e8afaa3c1fab0435acb068426091bdf776263112..94da73ef6c77308a8bc21db4c0bca22a79376b58 100644
--- a/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java
+++ b/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java
@@ -312,7 +312,13 @@ public class BuiltInRegistries {
diff --git a/patches/server/0014-Timings-v2.patch b/patches/unapplied/server/0014-Timings-v2.patch
similarity index 100%
rename from patches/server/0014-Timings-v2.patch
rename to patches/unapplied/server/0014-Timings-v2.patch
diff --git a/patches/server/0015-Add-TickThread.patch b/patches/unapplied/server/0015-Add-TickThread.patch
similarity index 100%
rename from patches/server/0015-Add-TickThread.patch
rename to patches/unapplied/server/0015-Add-TickThread.patch
diff --git a/patches/server/0016-Further-improve-server-tick-loop.patch b/patches/unapplied/server/0016-Further-improve-server-tick-loop.patch
similarity index 99%
rename from patches/server/0016-Further-improve-server-tick-loop.patch
rename to patches/unapplied/server/0016-Further-improve-server-tick-loop.patch
index 53f246d057..d4aa75ee92 100644
--- a/patches/server/0016-Further-improve-server-tick-loop.patch
+++ b/patches/unapplied/server/0016-Further-improve-server-tick-loop.patch
@@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly.
Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3365d2ec8426888c16873a311226fa69840fa2f0..dd93d4957459556a102b9bf712dd80cb69810cb7 100644
+index 2be50609ccf90d3db6e572377ba63bcbad156382..c1f9acad1e97915dfad5fbc0ba2547853e3b37f1 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -283,7 +283,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop & StringRepresentable> extends Prope
@@ -51,7 +51,7 @@ index 3c590d400032d8266de63aae301fedbd83d37a1d..3a850321a4bcc68058483b5fd53e829c
return true;
} else {
diff --git a/src/main/java/net/minecraft/world/level/block/state/properties/Property.java b/src/main/java/net/minecraft/world/level/block/state/properties/Property.java
-index ce06c1702e9ff2e966d94a0d622264e16ded493c..bad6c58b0adc1ca630d3e943a86a2bc66dd94c9f 100644
+index 7cbc5e6e75f389f47ef07045f9876cec192f14e4..9055f15af0cae55effa6942913a9d7edf3857e07 100644
--- a/src/main/java/net/minecraft/world/level/block/state/properties/Property.java
+++ b/src/main/java/net/minecraft/world/level/block/state/properties/Property.java
@@ -70,7 +70,7 @@ public abstract class Property> {
diff --git a/patches/server/0103-Configurable-packet-in-spam-threshold.patch b/patches/unapplied/server/0103-Configurable-packet-in-spam-threshold.patch
similarity index 94%
rename from patches/server/0103-Configurable-packet-in-spam-threshold.patch
rename to patches/unapplied/server/0103-Configurable-packet-in-spam-threshold.patch
index 45836f3841..b14c58ef25 100644
--- a/patches/server/0103-Configurable-packet-in-spam-threshold.patch
+++ b/patches/unapplied/server/0103-Configurable-packet-in-spam-threshold.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable packet in spam threshold
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 801e1727bd291f647c91e2c325810ead070f3752..b5471f86e4c9b5167ac96eb7a114cde0f6a35a9e 100644
+index 19ff229f90d07447947afa8b4794b683feceb574..6a0e6697331732555f9e4e63e95dce0a2bfc1a85 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1529,13 +1529,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0104-Configurable-flying-kick-messages.patch b/patches/unapplied/server/0104-Configurable-flying-kick-messages.patch
similarity index 95%
rename from patches/server/0104-Configurable-flying-kick-messages.patch
rename to patches/unapplied/server/0104-Configurable-flying-kick-messages.patch
index e0b03a6592..4bc41b33a5 100644
--- a/patches/server/0104-Configurable-flying-kick-messages.patch
+++ b/patches/unapplied/server/0104-Configurable-flying-kick-messages.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable flying kick messages
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b5471f86e4c9b5167ac96eb7a114cde0f6a35a9e..69e525776d57b2fe80d8bb9e94e981e553f329a3 100644
+index 6a0e6697331732555f9e4e63e95dce0a2bfc1a85..76d3ecbe62775b09aca1306b1adab56a5c730162 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -338,7 +338,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0105-Add-EntityZapEvent.patch b/patches/unapplied/server/0105-Add-EntityZapEvent.patch
similarity index 100%
rename from patches/server/0105-Add-EntityZapEvent.patch
rename to patches/unapplied/server/0105-Add-EntityZapEvent.patch
diff --git a/patches/server/0106-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch b/patches/unapplied/server/0106-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch
similarity index 100%
rename from patches/server/0106-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch
rename to patches/unapplied/server/0106-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch
diff --git a/patches/server/0107-Cache-user-authenticator-threads.patch b/patches/unapplied/server/0107-Cache-user-authenticator-threads.patch
similarity index 100%
rename from patches/server/0107-Cache-user-authenticator-threads.patch
rename to patches/unapplied/server/0107-Cache-user-authenticator-threads.patch
diff --git a/patches/server/0108-Allow-Reloading-of-Command-Aliases.patch b/patches/unapplied/server/0108-Allow-Reloading-of-Command-Aliases.patch
similarity index 100%
rename from patches/server/0108-Allow-Reloading-of-Command-Aliases.patch
rename to patches/unapplied/server/0108-Allow-Reloading-of-Command-Aliases.patch
diff --git a/patches/server/0109-Add-source-to-PlayerExpChangeEvent.patch b/patches/unapplied/server/0109-Add-source-to-PlayerExpChangeEvent.patch
similarity index 100%
rename from patches/server/0109-Add-source-to-PlayerExpChangeEvent.patch
rename to patches/unapplied/server/0109-Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/server/0110-Add-ProjectileCollideEvent.patch b/patches/unapplied/server/0110-Add-ProjectileCollideEvent.patch
similarity index 100%
rename from patches/server/0110-Add-ProjectileCollideEvent.patch
rename to patches/unapplied/server/0110-Add-ProjectileCollideEvent.patch
diff --git a/patches/server/0111-Prevent-Pathfinding-out-of-World-Border.patch b/patches/unapplied/server/0111-Prevent-Pathfinding-out-of-World-Border.patch
similarity index 100%
rename from patches/server/0111-Prevent-Pathfinding-out-of-World-Border.patch
rename to patches/unapplied/server/0111-Prevent-Pathfinding-out-of-World-Border.patch
diff --git a/patches/server/0112-Optimize-Level.hasChunkAt-BlockPosition-Z.patch b/patches/unapplied/server/0112-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
similarity index 100%
rename from patches/server/0112-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
rename to patches/unapplied/server/0112-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
diff --git a/patches/server/0113-Bound-Treasure-Maps-to-World-Border.patch b/patches/unapplied/server/0113-Bound-Treasure-Maps-to-World-Border.patch
similarity index 100%
rename from patches/server/0113-Bound-Treasure-Maps-to-World-Border.patch
rename to patches/unapplied/server/0113-Bound-Treasure-Maps-to-World-Border.patch
diff --git a/patches/server/0114-Configurable-Cartographer-Treasure-Maps.patch b/patches/unapplied/server/0114-Configurable-Cartographer-Treasure-Maps.patch
similarity index 100%
rename from patches/server/0114-Configurable-Cartographer-Treasure-Maps.patch
rename to patches/unapplied/server/0114-Configurable-Cartographer-Treasure-Maps.patch
diff --git a/patches/server/0115-Add-API-methods-to-control-if-armor-stands-can-move.patch b/patches/unapplied/server/0115-Add-API-methods-to-control-if-armor-stands-can-move.patch
similarity index 100%
rename from patches/server/0115-Add-API-methods-to-control-if-armor-stands-can-move.patch
rename to patches/unapplied/server/0115-Add-API-methods-to-control-if-armor-stands-can-move.patch
diff --git a/patches/server/0116-String-based-Action-Bar-API.patch b/patches/unapplied/server/0116-String-based-Action-Bar-API.patch
similarity index 96%
rename from patches/server/0116-String-based-Action-Bar-API.patch
rename to patches/unapplied/server/0116-String-based-Action-Bar-API.patch
index e26a398631..7a1dc79fbe 100644
--- a/patches/server/0116-String-based-Action-Bar-API.patch
+++ b/patches/unapplied/server/0116-String-based-Action-Bar-API.patch
@@ -26,7 +26,7 @@ index cb88a3a4e4c87a6d6c838183c1640b13d82c9344..0b391b0dc6262ef482c4a253a074b593
// Paper end
buf.writeComponent(this.text);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b79aea8ae49a4edbb45f0824535fd38d3686e67b..3d3927503dd7f157b59853c570ace002b7e07c25 100644
+index 02cabe9b5e413ce58b82061ea0347fc7a7ce6866..7acea9cd75fcb521ff3997f4fc4cd1d34c788192 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -307,6 +307,29 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0117-Properly-fix-item-duplication-bug.patch b/patches/unapplied/server/0117-Properly-fix-item-duplication-bug.patch
similarity index 100%
rename from patches/server/0117-Properly-fix-item-duplication-bug.patch
rename to patches/unapplied/server/0117-Properly-fix-item-duplication-bug.patch
diff --git a/patches/server/0118-Firework-API-s.patch b/patches/unapplied/server/0118-Firework-API-s.patch
similarity index 100%
rename from patches/server/0118-Firework-API-s.patch
rename to patches/unapplied/server/0118-Firework-API-s.patch
diff --git a/patches/server/0119-PlayerTeleportEndGatewayEvent.patch b/patches/unapplied/server/0119-PlayerTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/server/0119-PlayerTeleportEndGatewayEvent.patch
rename to patches/unapplied/server/0119-PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/server/0120-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/unapplied/server/0120-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 100%
rename from patches/server/0120-Provide-E-TE-Chunk-count-stat-methods.patch
rename to patches/unapplied/server/0120-Provide-E-TE-Chunk-count-stat-methods.patch
diff --git a/patches/server/0121-Enforce-Sync-Player-Saves.patch b/patches/unapplied/server/0121-Enforce-Sync-Player-Saves.patch
similarity index 100%
rename from patches/server/0121-Enforce-Sync-Player-Saves.patch
rename to patches/unapplied/server/0121-Enforce-Sync-Player-Saves.patch
diff --git a/patches/server/0122-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/unapplied/server/0122-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 100%
rename from patches/server/0122-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to patches/unapplied/server/0122-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
diff --git a/patches/server/0123-Cap-Entity-Collisions.patch b/patches/unapplied/server/0123-Cap-Entity-Collisions.patch
similarity index 100%
rename from patches/server/0123-Cap-Entity-Collisions.patch
rename to patches/unapplied/server/0123-Cap-Entity-Collisions.patch
diff --git a/patches/server/0124-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/unapplied/server/0124-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 100%
rename from patches/server/0124-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to patches/unapplied/server/0124-Remove-CraftScheduler-Async-Task-Debugger.patch
diff --git a/patches/server/0125-Properly-handle-async-calls-to-restart-the-server.patch b/patches/unapplied/server/0125-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 99%
rename from patches/server/0125-Properly-handle-async-calls-to-restart-the-server.patch
rename to patches/unapplied/server/0125-Properly-handle-async-calls-to-restart-the-server.patch
index 09c60eff3e..a7eecd2511 100644
--- a/patches/server/0125-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/patches/unapplied/server/0125-Properly-handle-async-calls-to-restart-the-server.patch
@@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result
in corruption/dataloss.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b9c006bef0491c401ae3a447a3f67742a75cb74f..48513e585ce02c301983adbe1224e95ff7f9a345 100644
+index 04cc2b69336ceb463910c081119f3188d8c426d3..fa1a6c2f1c11506243cfc61b519bef578e5627fc 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -236,6 +236,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fa8db93541dc62dc61bccc53c1aaeb3666d80ee1..5d4730b9ced378c1e77d7734f2f8aba6d09a19d0 100644
+index ff113cb3c11492ec09e0568f96fff40cbcd53716..8eec3d8b1693d9f9d7d882275e6f00cef4d3520f 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -688,21 +688,58 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0162-PlayerPickupExperienceEvent.patch b/patches/unapplied/server/0162-PlayerPickupExperienceEvent.patch
similarity index 100%
rename from patches/server/0162-PlayerPickupExperienceEvent.patch
rename to patches/unapplied/server/0162-PlayerPickupExperienceEvent.patch
diff --git a/patches/server/0163-Ability-to-apply-mending-to-XP-API.patch b/patches/unapplied/server/0163-Ability-to-apply-mending-to-XP-API.patch
similarity index 100%
rename from patches/server/0163-Ability-to-apply-mending-to-XP-API.patch
rename to patches/unapplied/server/0163-Ability-to-apply-mending-to-XP-API.patch
diff --git a/patches/server/0164-PlayerNaturallySpawnCreaturesEvent.patch b/patches/unapplied/server/0164-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 100%
rename from patches/server/0164-PlayerNaturallySpawnCreaturesEvent.patch
rename to patches/unapplied/server/0164-PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/patches/server/0165-Add-setPlayerProfile-API-for-Skulls.patch b/patches/unapplied/server/0165-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 100%
rename from patches/server/0165-Add-setPlayerProfile-API-for-Skulls.patch
rename to patches/unapplied/server/0165-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/server/0166-PreCreatureSpawnEvent.patch b/patches/unapplied/server/0166-PreCreatureSpawnEvent.patch
similarity index 100%
rename from patches/server/0166-PreCreatureSpawnEvent.patch
rename to patches/unapplied/server/0166-PreCreatureSpawnEvent.patch
diff --git a/patches/server/0167-Fill-Profile-Property-Events.patch b/patches/unapplied/server/0167-Fill-Profile-Property-Events.patch
similarity index 100%
rename from patches/server/0167-Fill-Profile-Property-Events.patch
rename to patches/unapplied/server/0167-Fill-Profile-Property-Events.patch
diff --git a/patches/server/0168-Add-PlayerAdvancementCriterionGrantEvent.patch b/patches/unapplied/server/0168-Add-PlayerAdvancementCriterionGrantEvent.patch
similarity index 100%
rename from patches/server/0168-Add-PlayerAdvancementCriterionGrantEvent.patch
rename to patches/unapplied/server/0168-Add-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/server/0169-Add-ArmorStand-Item-Meta.patch b/patches/unapplied/server/0169-Add-ArmorStand-Item-Meta.patch
similarity index 100%
rename from patches/server/0169-Add-ArmorStand-Item-Meta.patch
rename to patches/unapplied/server/0169-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/server/0170-Extend-Player-Interact-cancellation.patch b/patches/unapplied/server/0170-Extend-Player-Interact-cancellation.patch
similarity index 100%
rename from patches/server/0170-Extend-Player-Interact-cancellation.patch
rename to patches/unapplied/server/0170-Extend-Player-Interact-cancellation.patch
diff --git a/patches/server/0171-Tameable-getOwnerUniqueId-API.patch b/patches/unapplied/server/0171-Tameable-getOwnerUniqueId-API.patch
similarity index 100%
rename from patches/server/0171-Tameable-getOwnerUniqueId-API.patch
rename to patches/unapplied/server/0171-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/server/0172-Toggleable-player-crits.patch b/patches/unapplied/server/0172-Toggleable-player-crits.patch
similarity index 100%
rename from patches/server/0172-Toggleable-player-crits.patch
rename to patches/unapplied/server/0172-Toggleable-player-crits.patch
diff --git a/patches/server/0173-Disable-Explicit-Network-Manager-Flushing.patch b/patches/unapplied/server/0173-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 100%
rename from patches/server/0173-Disable-Explicit-Network-Manager-Flushing.patch
rename to patches/unapplied/server/0173-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/patches/server/0174-Implement-extended-PaperServerListPingEvent.patch b/patches/unapplied/server/0174-Implement-extended-PaperServerListPingEvent.patch
similarity index 99%
rename from patches/server/0174-Implement-extended-PaperServerListPingEvent.patch
rename to patches/unapplied/server/0174-Implement-extended-PaperServerListPingEvent.patch
index 919b4393df..05b4df7406 100644
--- a/patches/server/0174-Implement-extended-PaperServerListPingEvent.patch
+++ b/patches/unapplied/server/0174-Implement-extended-PaperServerListPingEvent.patch
@@ -181,7 +181,7 @@ index 0000000000000000000000000000000000000000..6b0bdc266109cdfb874f08bf74323603
+
+}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 22b9d4bebee30877225b08b46cec6084b12a9c5a..09bd8a6576647c612e9d7f807780b1e20478a534 100644
+index 7e4fd9fa173b24261b88fb5e898c905721e69dca..02df8d59ced48bfebfacbfab669e245539605ede 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -3,6 +3,9 @@ package net.minecraft.server;
diff --git a/patches/server/0175-Add-more-fields-to-AsyncPreLoginEvent.patch b/patches/unapplied/server/0175-Add-more-fields-to-AsyncPreLoginEvent.patch
similarity index 100%
rename from patches/server/0175-Add-more-fields-to-AsyncPreLoginEvent.patch
rename to patches/unapplied/server/0175-Add-more-fields-to-AsyncPreLoginEvent.patch
diff --git a/patches/server/0176-Player.setPlayerProfile-API.patch b/patches/unapplied/server/0176-Player.setPlayerProfile-API.patch
similarity index 100%
rename from patches/server/0176-Player.setPlayerProfile-API.patch
rename to patches/unapplied/server/0176-Player.setPlayerProfile-API.patch
diff --git a/patches/server/0177-getPlayerUniqueId-API.patch b/patches/unapplied/server/0177-getPlayerUniqueId-API.patch
similarity index 100%
rename from patches/server/0177-getPlayerUniqueId-API.patch
rename to patches/unapplied/server/0177-getPlayerUniqueId-API.patch
diff --git a/patches/server/0178-Improved-Async-Task-Scheduler.patch b/patches/unapplied/server/0178-Improved-Async-Task-Scheduler.patch
similarity index 100%
rename from patches/server/0178-Improved-Async-Task-Scheduler.patch
rename to patches/unapplied/server/0178-Improved-Async-Task-Scheduler.patch
diff --git a/patches/server/0179-Make-legacy-ping-handler-more-reliable.patch b/patches/unapplied/server/0179-Make-legacy-ping-handler-more-reliable.patch
similarity index 100%
rename from patches/server/0179-Make-legacy-ping-handler-more-reliable.patch
rename to patches/unapplied/server/0179-Make-legacy-ping-handler-more-reliable.patch
diff --git a/patches/server/0180-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/unapplied/server/0180-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 100%
rename from patches/server/0180-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to patches/unapplied/server/0180-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/patches/server/0181-Flag-to-disable-the-channel-limit.patch b/patches/unapplied/server/0181-Flag-to-disable-the-channel-limit.patch
similarity index 100%
rename from patches/server/0181-Flag-to-disable-the-channel-limit.patch
rename to patches/unapplied/server/0181-Flag-to-disable-the-channel-limit.patch
diff --git a/patches/server/0182-Add-openSign-method-to-HumanEntity.patch b/patches/unapplied/server/0182-Add-openSign-method-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0182-Add-openSign-method-to-HumanEntity.patch
rename to patches/unapplied/server/0182-Add-openSign-method-to-HumanEntity.patch
diff --git a/patches/server/0183-Configurable-sprint-interruption-on-attack.patch b/patches/unapplied/server/0183-Configurable-sprint-interruption-on-attack.patch
similarity index 100%
rename from patches/server/0183-Configurable-sprint-interruption-on-attack.patch
rename to patches/unapplied/server/0183-Configurable-sprint-interruption-on-attack.patch
diff --git a/patches/server/0184-EndermanEscapeEvent.patch b/patches/unapplied/server/0184-EndermanEscapeEvent.patch
similarity index 100%
rename from patches/server/0184-EndermanEscapeEvent.patch
rename to patches/unapplied/server/0184-EndermanEscapeEvent.patch
diff --git a/patches/server/0185-Enderman.teleportRandomly.patch b/patches/unapplied/server/0185-Enderman.teleportRandomly.patch
similarity index 100%
rename from patches/server/0185-Enderman.teleportRandomly.patch
rename to patches/unapplied/server/0185-Enderman.teleportRandomly.patch
diff --git a/patches/server/0186-Block-Enderpearl-Travel-Exploit.patch b/patches/unapplied/server/0186-Block-Enderpearl-Travel-Exploit.patch
similarity index 100%
rename from patches/server/0186-Block-Enderpearl-Travel-Exploit.patch
rename to patches/unapplied/server/0186-Block-Enderpearl-Travel-Exploit.patch
diff --git a/patches/server/0187-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/unapplied/server/0187-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 100%
rename from patches/server/0187-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to patches/unapplied/server/0187-Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/patches/server/0188-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/unapplied/server/0188-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 100%
rename from patches/server/0188-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to patches/unapplied/server/0188-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
diff --git a/patches/server/0189-EndermanAttackPlayerEvent.patch b/patches/unapplied/server/0189-EndermanAttackPlayerEvent.patch
similarity index 100%
rename from patches/server/0189-EndermanAttackPlayerEvent.patch
rename to patches/unapplied/server/0189-EndermanAttackPlayerEvent.patch
diff --git a/patches/server/0190-WitchConsumePotionEvent.patch b/patches/unapplied/server/0190-WitchConsumePotionEvent.patch
similarity index 100%
rename from patches/server/0190-WitchConsumePotionEvent.patch
rename to patches/unapplied/server/0190-WitchConsumePotionEvent.patch
diff --git a/patches/server/0191-WitchThrowPotionEvent.patch b/patches/unapplied/server/0191-WitchThrowPotionEvent.patch
similarity index 100%
rename from patches/server/0191-WitchThrowPotionEvent.patch
rename to patches/unapplied/server/0191-WitchThrowPotionEvent.patch
diff --git a/patches/server/0192-WitchReadyPotionEvent.patch b/patches/unapplied/server/0192-WitchReadyPotionEvent.patch
similarity index 100%
rename from patches/server/0192-WitchReadyPotionEvent.patch
rename to patches/unapplied/server/0192-WitchReadyPotionEvent.patch
diff --git a/patches/server/0193-ItemStack-getMaxItemUseDuration.patch b/patches/unapplied/server/0193-ItemStack-getMaxItemUseDuration.patch
similarity index 100%
rename from patches/server/0193-ItemStack-getMaxItemUseDuration.patch
rename to patches/unapplied/server/0193-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/server/0194-Add-EntityTeleportEndGatewayEvent.patch b/patches/unapplied/server/0194-Add-EntityTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/server/0194-Add-EntityTeleportEndGatewayEvent.patch
rename to patches/unapplied/server/0194-Add-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/server/0195-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/unapplied/server/0195-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 100%
rename from patches/server/0195-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to patches/unapplied/server/0195-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/patches/server/0196-Fix-CraftEntity-hashCode.patch b/patches/unapplied/server/0196-Fix-CraftEntity-hashCode.patch
similarity index 100%
rename from patches/server/0196-Fix-CraftEntity-hashCode.patch
rename to patches/unapplied/server/0196-Fix-CraftEntity-hashCode.patch
diff --git a/patches/server/0197-Configurable-LootPool-luck-formula.patch b/patches/unapplied/server/0197-Configurable-LootPool-luck-formula.patch
similarity index 100%
rename from patches/server/0197-Configurable-LootPool-luck-formula.patch
rename to patches/unapplied/server/0197-Configurable-LootPool-luck-formula.patch
diff --git a/patches/server/0198-Print-Error-details-when-failing-to-save-player-data.patch b/patches/unapplied/server/0198-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 100%
rename from patches/server/0198-Print-Error-details-when-failing-to-save-player-data.patch
rename to patches/unapplied/server/0198-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/patches/server/0199-Make-shield-blocking-delay-configurable.patch b/patches/unapplied/server/0199-Make-shield-blocking-delay-configurable.patch
similarity index 100%
rename from patches/server/0199-Make-shield-blocking-delay-configurable.patch
rename to patches/unapplied/server/0199-Make-shield-blocking-delay-configurable.patch
diff --git a/patches/server/0200-Improve-EntityShootBowEvent.patch b/patches/unapplied/server/0200-Improve-EntityShootBowEvent.patch
similarity index 100%
rename from patches/server/0200-Improve-EntityShootBowEvent.patch
rename to patches/unapplied/server/0200-Improve-EntityShootBowEvent.patch
diff --git a/patches/server/0201-PlayerReadyArrowEvent.patch b/patches/unapplied/server/0201-PlayerReadyArrowEvent.patch
similarity index 100%
rename from patches/server/0201-PlayerReadyArrowEvent.patch
rename to patches/unapplied/server/0201-PlayerReadyArrowEvent.patch
diff --git a/patches/server/0202-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch b/patches/unapplied/server/0202-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
similarity index 100%
rename from patches/server/0202-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
rename to patches/unapplied/server/0202-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
diff --git a/patches/server/0203-Expand-Explosions-API.patch b/patches/unapplied/server/0203-Expand-Explosions-API.patch
similarity index 100%
rename from patches/server/0203-Expand-Explosions-API.patch
rename to patches/unapplied/server/0203-Expand-Explosions-API.patch
diff --git a/patches/server/0204-LivingEntity-Active-Item-API.patch b/patches/unapplied/server/0204-LivingEntity-Active-Item-API.patch
similarity index 100%
rename from patches/server/0204-LivingEntity-Active-Item-API.patch
rename to patches/unapplied/server/0204-LivingEntity-Active-Item-API.patch
diff --git a/patches/server/0205-RangedEntity-API.patch b/patches/unapplied/server/0205-RangedEntity-API.patch
similarity index 100%
rename from patches/server/0205-RangedEntity-API.patch
rename to patches/unapplied/server/0205-RangedEntity-API.patch
diff --git a/patches/server/0206-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/unapplied/server/0206-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 100%
rename from patches/server/0206-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to patches/unapplied/server/0206-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/patches/server/0207-Implement-World.getEntity-UUID-API.patch b/patches/unapplied/server/0207-Implement-World.getEntity-UUID-API.patch
similarity index 100%
rename from patches/server/0207-Implement-World.getEntity-UUID-API.patch
rename to patches/unapplied/server/0207-Implement-World.getEntity-UUID-API.patch
diff --git a/patches/server/0208-InventoryCloseEvent-Reason-API.patch b/patches/unapplied/server/0208-InventoryCloseEvent-Reason-API.patch
similarity index 100%
rename from patches/server/0208-InventoryCloseEvent-Reason-API.patch
rename to patches/unapplied/server/0208-InventoryCloseEvent-Reason-API.patch
diff --git a/patches/server/0209-Vex-get-setSummoner-API.patch b/patches/unapplied/server/0209-Vex-get-setSummoner-API.patch
similarity index 100%
rename from patches/server/0209-Vex-get-setSummoner-API.patch
rename to patches/unapplied/server/0209-Vex-get-setSummoner-API.patch
diff --git a/patches/server/0210-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/unapplied/server/0210-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 94%
rename from patches/server/0210-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to patches/unapplied/server/0210-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index a28ff94015..f74a7d7572 100644
--- a/patches/server/0210-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/patches/unapplied/server/0210-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is
cancelled to avoid this problem.
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 29ffe034b3b7838e20be4d6a52a82cec004eb2a1..91cc18da4f0beca4cc4a9e13627b87931262efb6 100644
+index 0217a40d7c22d31fa5f5046df6f0c64d8bb44442..de6fff0e915c66123d0691840b180cf60dc8a95a 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2421,6 +2421,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0211-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/unapplied/server/0211-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
similarity index 100%
rename from patches/server/0211-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
rename to patches/unapplied/server/0211-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
diff --git a/patches/server/0212-add-more-information-to-Entity.toString.patch b/patches/unapplied/server/0212-add-more-information-to-Entity.toString.patch
similarity index 100%
rename from patches/server/0212-add-more-information-to-Entity.toString.patch
rename to patches/unapplied/server/0212-add-more-information-to-Entity.toString.patch
diff --git a/patches/server/0213-EnderDragon-Events.patch b/patches/unapplied/server/0213-EnderDragon-Events.patch
similarity index 100%
rename from patches/server/0213-EnderDragon-Events.patch
rename to patches/unapplied/server/0213-EnderDragon-Events.patch
diff --git a/patches/server/0214-PlayerElytraBoostEvent.patch b/patches/unapplied/server/0214-PlayerElytraBoostEvent.patch
similarity index 96%
rename from patches/server/0214-PlayerElytraBoostEvent.patch
rename to patches/unapplied/server/0214-PlayerElytraBoostEvent.patch
index 80552e3b6d..b614b1a177 100644
--- a/patches/server/0214-PlayerElytraBoostEvent.patch
+++ b/patches/unapplied/server/0214-PlayerElytraBoostEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerElytraBoostEvent
diff --git a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
-index 7c627d27300247db9122ab2081049345ef306073..4565cf51ee2f973b368a984436c02220ed9f4a70 100644
+index 3749cfca8f007973d1a2206d8f2ba15283a550e1..a9f82e37c088c6f6ae2a049fcc7acea01b8802cd 100644
--- a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
+++ b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
@@ -68,12 +68,19 @@ public class FireworkRocketItem extends Item {
diff --git a/patches/server/0215-PlayerLaunchProjectileEvent.patch b/patches/unapplied/server/0215-PlayerLaunchProjectileEvent.patch
similarity index 99%
rename from patches/server/0215-PlayerLaunchProjectileEvent.patch
rename to patches/unapplied/server/0215-PlayerLaunchProjectileEvent.patch
index 6e2265c0d2..b5abc76909 100644
--- a/patches/server/0215-PlayerLaunchProjectileEvent.patch
+++ b/patches/unapplied/server/0215-PlayerLaunchProjectileEvent.patch
@@ -150,7 +150,7 @@ index fe03ef2e400b246f7f3a9333506f22b63ae28690..ad147f392e7ef151d971d462431ab67d
return InteractionResultHolder.sidedSuccess(itemStack, world.isClientSide());
}
diff --git a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
-index eb655eb01e4841ca163666f21dae00f0632a11e5..8a82b8bec014b70d672cfaae84510ed84fd2ea97 100644
+index a9f82e37c088c6f6ae2a049fcc7acea01b8802cd..e1c8b24a92ea63a645406522a3c2fb5efd87f01a 100644
--- a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
+++ b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
@@ -54,8 +54,12 @@ public class FireworkRocketItem extends Item {
diff --git a/patches/server/0216-Improve-BlockPosition-inlining.patch b/patches/unapplied/server/0216-Improve-BlockPosition-inlining.patch
similarity index 100%
rename from patches/server/0216-Improve-BlockPosition-inlining.patch
rename to patches/unapplied/server/0216-Improve-BlockPosition-inlining.patch
diff --git a/patches/server/0217-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/unapplied/server/0217-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 100%
rename from patches/server/0217-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to patches/unapplied/server/0217-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
diff --git a/patches/server/0218-Vanished-players-don-t-have-rights.patch b/patches/unapplied/server/0218-Vanished-players-don-t-have-rights.patch
similarity index 100%
rename from patches/server/0218-Vanished-players-don-t-have-rights.patch
rename to patches/unapplied/server/0218-Vanished-players-don-t-have-rights.patch
diff --git a/patches/server/0219-Allow-disabling-armor-stand-ticking.patch b/patches/unapplied/server/0219-Allow-disabling-armor-stand-ticking.patch
similarity index 100%
rename from patches/server/0219-Allow-disabling-armor-stand-ticking.patch
rename to patches/unapplied/server/0219-Allow-disabling-armor-stand-ticking.patch
diff --git a/patches/server/0220-SkeletonHorse-Additions.patch b/patches/unapplied/server/0220-SkeletonHorse-Additions.patch
similarity index 97%
rename from patches/server/0220-SkeletonHorse-Additions.patch
rename to patches/unapplied/server/0220-SkeletonHorse-Additions.patch
index 201b108f16..bd079ca41a 100644
--- a/patches/server/0220-SkeletonHorse-Additions.patch
+++ b/patches/unapplied/server/0220-SkeletonHorse-Additions.patch
@@ -32,7 +32,7 @@ index 8f20239f3ef7ebe41fac8ee6e024c36dafec33c4..d00fb16ae3b94dfcb10fd1a7c1671595
this.horse.setTrap(false);
diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java
-index 72b3913d00d6f2ec01a716444debe065c48174f6..c35d5865b77203d0de6467d2793424837704e95a 100644
+index 77ae7882a08441d9a80b50492be5e48487a2fdab..d465fb01af4c8610f83ecb9c68b83127cf7e95ae 100644
--- a/src/main/java/net/minecraft/world/level/EntityGetter.java
+++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
@@ -97,6 +97,28 @@ public interface EntityGetter {
diff --git a/patches/server/0221-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/unapplied/server/0221-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 100%
rename from patches/server/0221-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to patches/unapplied/server/0221-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/patches/server/0222-Expand-ArmorStand-API.patch b/patches/unapplied/server/0222-Expand-ArmorStand-API.patch
similarity index 100%
rename from patches/server/0222-Expand-ArmorStand-API.patch
rename to patches/unapplied/server/0222-Expand-ArmorStand-API.patch
diff --git a/patches/server/0223-AnvilDamageEvent.patch b/patches/unapplied/server/0223-AnvilDamageEvent.patch
similarity index 100%
rename from patches/server/0223-AnvilDamageEvent.patch
rename to patches/unapplied/server/0223-AnvilDamageEvent.patch
diff --git a/patches/server/0224-Add-TNTPrimeEvent.patch b/patches/unapplied/server/0224-Add-TNTPrimeEvent.patch
similarity index 100%
rename from patches/server/0224-Add-TNTPrimeEvent.patch
rename to patches/unapplied/server/0224-Add-TNTPrimeEvent.patch
diff --git a/patches/server/0225-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/unapplied/server/0225-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 97%
rename from patches/server/0225-Break-up-and-make-tab-spam-limits-configurable.patch
rename to patches/unapplied/server/0225-Break-up-and-make-tab-spam-limits-configurable.patch
index eef3036873..99d88c7a3a 100644
--- a/patches/server/0225-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/unapplied/server/0225-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
plugins doing unsafe things.
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 91cc18da4f0beca4cc4a9e13627b87931262efb6..a2eb93d47f659eb5b978358ee409bbf5f5d4d35a 100644
+index de6fff0e915c66123d0691840b180cf60dc8a95a..7663110df928ec88fc97e3b7d65671001db2d1bc 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -256,6 +256,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0226-Fix-NBT-type-issues.patch b/patches/unapplied/server/0226-Fix-NBT-type-issues.patch
similarity index 100%
rename from patches/server/0226-Fix-NBT-type-issues.patch
rename to patches/unapplied/server/0226-Fix-NBT-type-issues.patch
diff --git a/patches/server/0227-Remove-unnecessary-itemmeta-handling.patch b/patches/unapplied/server/0227-Remove-unnecessary-itemmeta-handling.patch
similarity index 100%
rename from patches/server/0227-Remove-unnecessary-itemmeta-handling.patch
rename to patches/unapplied/server/0227-Remove-unnecessary-itemmeta-handling.patch
diff --git a/patches/server/0228-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/unapplied/server/0228-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 100%
rename from patches/server/0228-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to patches/unapplied/server/0228-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
diff --git a/patches/server/0229-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/unapplied/server/0229-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 99%
rename from patches/server/0229-Add-Early-Warning-Feature-to-WatchDog.patch
rename to patches/unapplied/server/0229-Add-Early-Warning-Feature-to-WatchDog.patch
index 76d44df2fe..2142ed4de7 100644
--- a/patches/server/0229-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/unapplied/server/0229-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash.
This will help diagnose what was going on in that time before the crash.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 09bd8a6576647c612e9d7f807780b1e20478a534..3e6008d27ed81453f6b4448f0334b8d343f66694 100644
+index 02df8d59ced48bfebfacbfab669e245539605ede..8196ecb2a7280a4f60a5fea18c484d6419953b48 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1092,6 +1092,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5190939658fce990e166b7c4f5998dd030a156e8..e5113e86836f9c21570705b1ad312d76e8162e5f 100644
+index f66c6167f24941b9cfdf4479d6cfbffcc29a7ba6..a16751a23eb6aab8c25520127d4dbea0c991c32c 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1760,7 +1760,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0480-Zombie-API-breaking-doors.patch b/patches/unapplied/server/0480-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0480-Zombie-API-breaking-doors.patch
rename to patches/unapplied/server/0480-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0481-Fix-nerfed-slime-when-splitting.patch b/patches/unapplied/server/0481-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0481-Fix-nerfed-slime-when-splitting.patch
rename to patches/unapplied/server/0481-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0482-Add-EntityLoadCrossbowEvent.patch b/patches/unapplied/server/0482-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0482-Add-EntityLoadCrossbowEvent.patch
rename to patches/unapplied/server/0482-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0483-Add-WorldGameRuleChangeEvent.patch b/patches/unapplied/server/0483-Add-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0483-Add-WorldGameRuleChangeEvent.patch
rename to patches/unapplied/server/0483-Add-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0484-Add-ServerResourcesReloadedEvent.patch b/patches/unapplied/server/0484-Add-ServerResourcesReloadedEvent.patch
similarity index 97%
rename from patches/server/0484-Add-ServerResourcesReloadedEvent.patch
rename to patches/unapplied/server/0484-Add-ServerResourcesReloadedEvent.patch
index 9d87b0e24f..78e525f4d8 100644
--- a/patches/server/0484-Add-ServerResourcesReloadedEvent.patch
+++ b/patches/unapplied/server/0484-Add-ServerResourcesReloadedEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ServerResourcesReloadedEvent
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 99ae9628d96d6d3e42cd038eb4a0d01237cc6b1b..46cc2649ca482bd2bda37247717d8476dbb76a34 100644
+index 70ae9d44dd860014fd9a599e3a4e4a3fe80068ff..23d68feaa060514e6582a9d47a9ca7db9421c29c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -2036,7 +2036,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 12b81d6dc04586d2491a382b6198f986b2b5bae1..e12740f601acbe2b344d8e1fffc4bee2c752face 100644
+index d0409856a3aee811714c9254f4436b7f6bb94bf0..872e59c5de3a98bbdf40cf6d2aeb0694f2b88689 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2632,7 +2632,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0546-Introduce-beacon-activation-deactivation-events.patch b/patches/unapplied/server/0546-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0546-Introduce-beacon-activation-deactivation-events.patch
rename to patches/unapplied/server/0546-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0547-Add-Channel-initialization-listeners.patch b/patches/unapplied/server/0547-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0547-Add-Channel-initialization-listeners.patch
rename to patches/unapplied/server/0547-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0548-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/unapplied/server/0548-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0548-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/unapplied/server/0548-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0549-Add-more-WanderingTrader-API.patch b/patches/unapplied/server/0549-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0549-Add-more-WanderingTrader-API.patch
rename to patches/unapplied/server/0549-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0550-Add-EntityBlockStorage-clearEntities.patch b/patches/unapplied/server/0550-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0550-Add-EntityBlockStorage-clearEntities.patch
rename to patches/unapplied/server/0550-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0551-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/unapplied/server/0551-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0551-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/unapplied/server/0551-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0552-Add-HiddenPotionEffect-API.patch b/patches/unapplied/server/0552-Add-HiddenPotionEffect-API.patch
similarity index 100%
rename from patches/server/0552-Add-HiddenPotionEffect-API.patch
rename to patches/unapplied/server/0552-Add-HiddenPotionEffect-API.patch
diff --git a/patches/server/0553-Inventory-close.patch b/patches/unapplied/server/0553-Inventory-close.patch
similarity index 100%
rename from patches/server/0553-Inventory-close.patch
rename to patches/unapplied/server/0553-Inventory-close.patch
diff --git a/patches/server/0554-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/unapplied/server/0554-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0554-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/unapplied/server/0554-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0555-Add-basic-Datapack-API.patch b/patches/unapplied/server/0555-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0555-Add-basic-Datapack-API.patch
rename to patches/unapplied/server/0555-Add-basic-Datapack-API.patch
diff --git a/patches/server/0556-Add-environment-variable-to-disable-server-gui.patch b/patches/unapplied/server/0556-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0556-Add-environment-variable-to-disable-server-gui.patch
rename to patches/unapplied/server/0556-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0557-Expand-PlayerGameModeChangeEvent.patch b/patches/unapplied/server/0557-Expand-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/server/0557-Expand-PlayerGameModeChangeEvent.patch
rename to patches/unapplied/server/0557-Expand-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0558-ItemStack-repair-check-API.patch b/patches/unapplied/server/0558-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0558-ItemStack-repair-check-API.patch
rename to patches/unapplied/server/0558-ItemStack-repair-check-API.patch
diff --git a/patches/server/0559-More-Enchantment-API.patch b/patches/unapplied/server/0559-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0559-More-Enchantment-API.patch
rename to patches/unapplied/server/0559-More-Enchantment-API.patch
diff --git a/patches/server/0560-Move-range-check-for-block-placing-up.patch b/patches/unapplied/server/0560-Move-range-check-for-block-placing-up.patch
similarity index 92%
rename from patches/server/0560-Move-range-check-for-block-placing-up.patch
rename to patches/unapplied/server/0560-Move-range-check-for-block-placing-up.patch
index 6ba529d1a6..96ef06f137 100644
--- a/patches/server/0560-Move-range-check-for-block-placing-up.patch
+++ b/patches/unapplied/server/0560-Move-range-check-for-block-placing-up.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c9a8d04d1485a9493f6353beb7998801e286923e..ba7f0f4e2840b88d8f53c5720752cfeed2493c49 100644
+index 77560a31fc90387efb14ae0432b7a6aafb8cab61..ffbd1d99f7f896eb2b0af04e8f344f7fa0dc09d7 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1738,6 +1738,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0561-Add-Mob-lookAt-API.patch b/patches/unapplied/server/0561-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0561-Add-Mob-lookAt-API.patch
rename to patches/unapplied/server/0561-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0562-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/unapplied/server/0562-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
similarity index 100%
rename from patches/server/0562-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
rename to patches/unapplied/server/0562-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
diff --git a/patches/server/0563-Add-Unix-domain-socket-support.patch b/patches/unapplied/server/0563-Add-Unix-domain-socket-support.patch
similarity index 98%
rename from patches/server/0563-Add-Unix-domain-socket-support.patch
rename to patches/unapplied/server/0563-Add-Unix-domain-socket-support.patch
index 297b991d83..96e615aa5d 100644
--- a/patches/server/0563-Add-Unix-domain-socket-support.patch
+++ b/patches/unapplied/server/0563-Add-Unix-domain-socket-support.patch
@@ -87,7 +87,7 @@ index 25ddfe8e5da65e4ac70be2820ba139e7f3852c0c..87abd6274f9da9367094bad0c28acfa4
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ba7f0f4e2840b88d8f53c5720752cfeed2493c49..a5dd14014fd214ec900e0c49064ee54b2f43ff8e 100644
+index ffbd1d99f7f896eb2b0af04e8f344f7fa0dc09d7..e2fc392afd6fa8fbb9d464262f12bb6a0c81f7f8 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2475,6 +2475,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0564-Add-EntityInsideBlockEvent.patch b/patches/unapplied/server/0564-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0564-Add-EntityInsideBlockEvent.patch
rename to patches/unapplied/server/0564-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0565-Attributes-API-for-item-defaults.patch b/patches/unapplied/server/0565-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0565-Attributes-API-for-item-defaults.patch
rename to patches/unapplied/server/0565-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0566-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/unapplied/server/0566-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/server/0566-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/unapplied/server/0566-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0567-More-Lidded-Block-API.patch b/patches/unapplied/server/0567-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0567-More-Lidded-Block-API.patch
rename to patches/unapplied/server/0567-More-Lidded-Block-API.patch
diff --git a/patches/server/0568-Limit-item-frame-cursors-on-maps.patch b/patches/unapplied/server/0568-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0568-Limit-item-frame-cursors-on-maps.patch
rename to patches/unapplied/server/0568-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0569-Add-PlayerKickEvent-causes.patch b/patches/unapplied/server/0569-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/0569-Add-PlayerKickEvent-causes.patch
rename to patches/unapplied/server/0569-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0570-Add-PufferFishStateChangeEvent.patch b/patches/unapplied/server/0570-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0570-Add-PufferFishStateChangeEvent.patch
rename to patches/unapplied/server/0570-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0571-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/unapplied/server/0571-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0571-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/unapplied/server/0571-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0572-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/unapplied/server/0572-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0572-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/unapplied/server/0572-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0573-Add-option-to-fix-items-merging-through-walls.patch b/patches/unapplied/server/0573-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0573-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/unapplied/server/0573-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0574-Add-BellRevealRaiderEvent.patch b/patches/unapplied/server/0574-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0574-Add-BellRevealRaiderEvent.patch
rename to patches/unapplied/server/0574-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0575-Fix-invulnerable-end-crystals.patch b/patches/unapplied/server/0575-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0575-Fix-invulnerable-end-crystals.patch
rename to patches/unapplied/server/0575-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0576-Add-ElderGuardianAppearanceEvent.patch b/patches/unapplied/server/0576-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0576-Add-ElderGuardianAppearanceEvent.patch
rename to patches/unapplied/server/0576-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0577-Fix-dangerous-end-portal-logic.patch b/patches/unapplied/server/0577-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0577-Fix-dangerous-end-portal-logic.patch
rename to patches/unapplied/server/0577-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0578-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/unapplied/server/0578-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0578-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/unapplied/server/0578-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0579-Make-item-validations-configurable.patch b/patches/unapplied/server/0579-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0579-Make-item-validations-configurable.patch
rename to patches/unapplied/server/0579-Make-item-validations-configurable.patch
diff --git a/patches/server/0580-Line-Of-Sight-Changes.patch b/patches/unapplied/server/0580-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0580-Line-Of-Sight-Changes.patch
rename to patches/unapplied/server/0580-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0581-add-per-world-spawn-limits.patch b/patches/unapplied/server/0581-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0581-add-per-world-spawn-limits.patch
rename to patches/unapplied/server/0581-add-per-world-spawn-limits.patch
diff --git a/patches/server/0582-Fix-potions-splash-events.patch b/patches/unapplied/server/0582-Fix-potions-splash-events.patch
similarity index 100%
rename from patches/server/0582-Fix-potions-splash-events.patch
rename to patches/unapplied/server/0582-Fix-potions-splash-events.patch
diff --git a/patches/server/0583-Add-more-LimitedRegion-API.patch b/patches/unapplied/server/0583-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0583-Add-more-LimitedRegion-API.patch
rename to patches/unapplied/server/0583-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0584-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/unapplied/server/0584-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 100%
rename from patches/server/0584-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/unapplied/server/0584-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0585-Missing-Entity-API.patch b/patches/unapplied/server/0585-Missing-Entity-API.patch
similarity index 99%
rename from patches/server/0585-Missing-Entity-API.patch
rename to patches/unapplied/server/0585-Missing-Entity-API.patch
index 15b6b347f6..578eebacca 100644
--- a/patches/server/0585-Missing-Entity-API.patch
+++ b/patches/unapplied/server/0585-Missing-Entity-API.patch
@@ -113,7 +113,7 @@ index 0000000000000000000000000000000000000000..41bf71d116ffc5431586ce54abba7f8d
+ }
+}
diff --git a/src/main/java/net/minecraft/world/entity/animal/AbstractSchoolingFish.java b/src/main/java/net/minecraft/world/entity/animal/AbstractSchoolingFish.java
-index eef7d260dcb9a9c8ea6efef3216d33c08e3ea287..79c79f825e4c9b748d54962d06356ef425359101 100644
+index 3982ddbd0fa133fa0ca0241c4fb68ce167ebcbed..59dbb4dd48f81cab5216d5d8edef6ccd6e7efd9e 100644
--- a/src/main/java/net/minecraft/world/entity/animal/AbstractSchoolingFish.java
+++ b/src/main/java/net/minecraft/world/entity/animal/AbstractSchoolingFish.java
@@ -52,6 +52,7 @@ public abstract class AbstractSchoolingFish extends AbstractFish {
diff --git a/patches/server/0586-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/unapplied/server/0586-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 92%
rename from patches/server/0586-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/unapplied/server/0586-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 20f139446c..9c10362717 100644
--- a/patches/server/0586-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/unapplied/server/0586-Ensure-disconnect-for-book-edit-is-called-on-main.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2e1a0b3d2dee21d6deba62ec710d92efdf33e1a6..75ff85e3710d5e70a32fe39e8469c1f169fd2d46 100644
+index 08f502452dc1c6ee83e04650b08a08e521c64144..37a801668c2fa4e7eaf4839b2f69a92f9f91907f 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1096,7 +1096,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0587-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/unapplied/server/0587-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0587-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/unapplied/server/0587-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0588-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/unapplied/server/0588-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from patches/server/0588-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/unapplied/server/0588-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0589-Fix-commands-from-signs-not-firing-command-events.patch b/patches/unapplied/server/0589-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0589-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/unapplied/server/0589-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0590-Add-PlayerArmSwingEvent.patch b/patches/unapplied/server/0590-Add-PlayerArmSwingEvent.patch
similarity index 92%
rename from patches/server/0590-Add-PlayerArmSwingEvent.patch
rename to patches/unapplied/server/0590-Add-PlayerArmSwingEvent.patch
index d3f4757d38..0e5d1b0c09 100644
--- a/patches/server/0590-Add-PlayerArmSwingEvent.patch
+++ b/patches/unapplied/server/0590-Add-PlayerArmSwingEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmSwingEvent
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 75ff85e3710d5e70a32fe39e8469c1f169fd2d46..bce87f55ad85837a17f783b5341ef5b64ab0ede0 100644
+index 37a801668c2fa4e7eaf4839b2f69a92f9f91907f..de6b8af2f586469cd97ad796ee9a841a83f8f068 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2328,7 +2328,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0591-Fix-kick-event-leave-message-not-being-sent.patch b/patches/unapplied/server/0591-Fix-kick-event-leave-message-not-being-sent.patch
similarity index 98%
rename from patches/server/0591-Fix-kick-event-leave-message-not-being-sent.patch
rename to patches/unapplied/server/0591-Fix-kick-event-leave-message-not-being-sent.patch
index c3d3547870..5b12bd148b 100644
--- a/patches/server/0591-Fix-kick-event-leave-message-not-being-sent.patch
+++ b/patches/unapplied/server/0591-Fix-kick-event-leave-message-not-being-sent.patch
@@ -50,7 +50,7 @@ index a65a1466dab52fca75cda16a4b22fef03b6207a0..0306771b8f90dcdd77f151c19c6c2d75
MinecraftServer minecraftserver = this.server;
Connection networkmanager = this.connection;
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bce87f55ad85837a17f783b5341ef5b64ab0ede0..42c24ed58fab0f7ff9f58b2a65818f45a5b7cc06 100644
+index de6b8af2f586469cd97ad796ee9a841a83f8f068..cb7d038b902c326d2ebec61f1dc40849c3cfbc63 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1882,6 +1882,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0592-Add-config-for-mobs-immune-to-default-effects.patch b/patches/unapplied/server/0592-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/0592-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/unapplied/server/0592-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0593-Don-t-apply-cramming-damage-to-players.patch b/patches/unapplied/server/0593-Don-t-apply-cramming-damage-to-players.patch
similarity index 100%
rename from patches/server/0593-Don-t-apply-cramming-damage-to-players.patch
rename to patches/unapplied/server/0593-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0594-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/unapplied/server/0594-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0594-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/unapplied/server/0594-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0595-Add-missing-forceDrop-toggles.patch b/patches/unapplied/server/0595-Add-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0595-Add-missing-forceDrop-toggles.patch
rename to patches/unapplied/server/0595-Add-missing-forceDrop-toggles.patch
diff --git a/patches/server/0596-Stinger-API.patch b/patches/unapplied/server/0596-Stinger-API.patch
similarity index 100%
rename from patches/server/0596-Stinger-API.patch
rename to patches/unapplied/server/0596-Stinger-API.patch
diff --git a/patches/server/0597-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/unapplied/server/0597-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0597-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/unapplied/server/0597-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0598-Add-System.out-err-catcher.patch b/patches/unapplied/server/0598-Add-System.out-err-catcher.patch
similarity index 100%
rename from patches/server/0598-Add-System.out-err-catcher.patch
rename to patches/unapplied/server/0598-Add-System.out-err-catcher.patch
diff --git a/patches/server/0599-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/unapplied/server/0599-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0599-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/unapplied/server/0599-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0600-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/unapplied/server/0600-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 93%
rename from patches/server/0600-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/unapplied/server/0600-Prevent-AFK-kick-while-watching-end-credits.patch
index 8ab33daef9..2ffc213d10 100644
--- a/patches/server/0600-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/unapplied/server/0600-Prevent-AFK-kick-while-watching-end-credits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 42c24ed58fab0f7ff9f58b2a65818f45a5b7cc06..2941445ea453e2fb88ea8de38c24bf755b93936a 100644
+index cb7d038b902c326d2ebec61f1dc40849c3cfbc63..574efd531199332a36fb26c70cc44bd5a05ff37d 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -389,7 +389,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0601-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/unapplied/server/0601-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0601-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/unapplied/server/0601-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0602-Add-PlayerSetSpawnEvent.patch b/patches/unapplied/server/0602-Add-PlayerSetSpawnEvent.patch
similarity index 100%
rename from patches/server/0602-Add-PlayerSetSpawnEvent.patch
rename to patches/unapplied/server/0602-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0603-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/unapplied/server/0603-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0603-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/unapplied/server/0603-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0604-Optimize-entity-tracker-passenger-checks.patch b/patches/unapplied/server/0604-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0604-Optimize-entity-tracker-passenger-checks.patch
rename to patches/unapplied/server/0604-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0605-Config-option-for-Piglins-guarding-chests.patch b/patches/unapplied/server/0605-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0605-Config-option-for-Piglins-guarding-chests.patch
rename to patches/unapplied/server/0605-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0606-Add-EntityDamageItemEvent.patch b/patches/unapplied/server/0606-Add-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0606-Add-EntityDamageItemEvent.patch
rename to patches/unapplied/server/0606-Add-EntityDamageItemEvent.patch
diff --git a/patches/server/0607-Optimize-indirect-passenger-iteration.patch b/patches/unapplied/server/0607-Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/0607-Optimize-indirect-passenger-iteration.patch
rename to patches/unapplied/server/0607-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0608-Configurable-item-frame-map-cursor-update-interval.patch b/patches/unapplied/server/0608-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0608-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/unapplied/server/0608-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0609-Clear-bucket-NBT-after-dispense.patch b/patches/unapplied/server/0609-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0609-Clear-bucket-NBT-after-dispense.patch
rename to patches/unapplied/server/0609-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0610-Change-EnderEye-target-without-changing-other-things.patch b/patches/unapplied/server/0610-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0610-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/unapplied/server/0610-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0611-Add-BlockBreakBlockEvent.patch b/patches/unapplied/server/0611-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0611-Add-BlockBreakBlockEvent.patch
rename to patches/unapplied/server/0611-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0612-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/unapplied/server/0612-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0612-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/unapplied/server/0612-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0613-More-CommandBlock-API.patch b/patches/unapplied/server/0613-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0613-More-CommandBlock-API.patch
rename to patches/unapplied/server/0613-More-CommandBlock-API.patch
diff --git a/patches/server/0614-Add-missing-team-sidebar-display-slots.patch b/patches/unapplied/server/0614-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0614-Add-missing-team-sidebar-display-slots.patch
rename to patches/unapplied/server/0614-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0615-Add-back-EntityPortalExitEvent.patch b/patches/unapplied/server/0615-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0615-Add-back-EntityPortalExitEvent.patch
rename to patches/unapplied/server/0615-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0616-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/unapplied/server/0616-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 100%
rename from patches/server/0616-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/unapplied/server/0616-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0617-Get-entity-default-attributes.patch b/patches/unapplied/server/0617-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0617-Get-entity-default-attributes.patch
rename to patches/unapplied/server/0617-Get-entity-default-attributes.patch
diff --git a/patches/server/0618-Left-handed-API.patch b/patches/unapplied/server/0618-Left-handed-API.patch
similarity index 100%
rename from patches/server/0618-Left-handed-API.patch
rename to patches/unapplied/server/0618-Left-handed-API.patch
diff --git a/patches/server/0619-Add-more-advancement-API.patch b/patches/unapplied/server/0619-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0619-Add-more-advancement-API.patch
rename to patches/unapplied/server/0619-Add-more-advancement-API.patch
diff --git a/patches/server/0620-Add-ItemFactory-getSpawnEgg-API.patch b/patches/unapplied/server/0620-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0620-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/unapplied/server/0620-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0621-Add-critical-damage-API.patch b/patches/unapplied/server/0621-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0621-Add-critical-damage-API.patch
rename to patches/unapplied/server/0621-Add-critical-damage-API.patch
diff --git a/patches/server/0622-Fix-issues-with-mob-conversion.patch b/patches/unapplied/server/0622-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0622-Fix-issues-with-mob-conversion.patch
rename to patches/unapplied/server/0622-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0623-Add-isCollidable-methods-to-various-places.patch b/patches/unapplied/server/0623-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0623-Add-isCollidable-methods-to-various-places.patch
rename to patches/unapplied/server/0623-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0624-Goat-ram-API.patch b/patches/unapplied/server/0624-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0624-Goat-ram-API.patch
rename to patches/unapplied/server/0624-Goat-ram-API.patch
diff --git a/patches/server/0625-Add-API-for-resetting-a-single-score.patch b/patches/unapplied/server/0625-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0625-Add-API-for-resetting-a-single-score.patch
rename to patches/unapplied/server/0625-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0626-Add-Raw-Byte-Entity-Serialization.patch b/patches/unapplied/server/0626-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/server/0626-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/unapplied/server/0626-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0627-Vanilla-command-permission-fixes.patch b/patches/unapplied/server/0627-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0627-Vanilla-command-permission-fixes.patch
rename to patches/unapplied/server/0627-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0628-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/unapplied/server/0628-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 100%
rename from patches/server/0628-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/unapplied/server/0628-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0629-Fix-GameProfileCache-concurrency.patch b/patches/unapplied/server/0629-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0629-Fix-GameProfileCache-concurrency.patch
rename to patches/unapplied/server/0629-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0630-Improve-and-expand-AsyncCatcher.patch b/patches/unapplied/server/0630-Improve-and-expand-AsyncCatcher.patch
similarity index 99%
rename from patches/server/0630-Improve-and-expand-AsyncCatcher.patch
rename to patches/unapplied/server/0630-Improve-and-expand-AsyncCatcher.patch
index b87817eeb4..a57e480c6c 100644
--- a/patches/server/0630-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/unapplied/server/0630-Improve-and-expand-AsyncCatcher.patch
@@ -17,7 +17,7 @@ Async catch modifications to critical entity state
Co-authored-by: Jake Potrebic
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2941445ea453e2fb88ea8de38c24bf755b93936a..666c6cb6f600973e1d84839aed715606279d4630 100644
+index 574efd531199332a36fb26c70cc44bd5a05ff37d..7efe0cc24590966075ae84d19c3899a43f9adc2a 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1570,6 +1570,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0631-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/unapplied/server/0631-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 100%
rename from patches/server/0631-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/unapplied/server/0631-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0632-Sanitize-ResourceLocation-error-logging.patch b/patches/unapplied/server/0632-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0632-Sanitize-ResourceLocation-error-logging.patch
rename to patches/unapplied/server/0632-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0633-Manually-inline-methods-in-BlockPosition.patch b/patches/unapplied/server/0633-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0633-Manually-inline-methods-in-BlockPosition.patch
rename to patches/unapplied/server/0633-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0634-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/unapplied/server/0634-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0634-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/unapplied/server/0634-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0635-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/unapplied/server/0635-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 100%
rename from patches/server/0635-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/unapplied/server/0635-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0636-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/unapplied/server/0636-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0636-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/unapplied/server/0636-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0637-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/unapplied/server/0637-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
similarity index 100%
rename from patches/server/0637-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
rename to patches/unapplied/server/0637-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
diff --git a/patches/server/0638-Time-scoreboard-search.patch b/patches/unapplied/server/0638-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0638-Time-scoreboard-search.patch
rename to patches/unapplied/server/0638-Time-scoreboard-search.patch
diff --git a/patches/server/0639-Oprimise-map-impl-for-tracked-players.patch b/patches/unapplied/server/0639-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0639-Oprimise-map-impl-for-tracked-players.patch
rename to patches/unapplied/server/0639-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0640-Add-missing-InventoryType.patch b/patches/unapplied/server/0640-Add-missing-InventoryType.patch
similarity index 100%
rename from patches/server/0640-Add-missing-InventoryType.patch
rename to patches/unapplied/server/0640-Add-missing-InventoryType.patch
diff --git a/patches/server/0641-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/unapplied/server/0641-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0641-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/unapplied/server/0641-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0642-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/unapplied/server/0642-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/0642-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/unapplied/server/0642-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0643-Check-requirement-before-suggesting-root-nodes.patch b/patches/unapplied/server/0643-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0643-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/unapplied/server/0643-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0644-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/unapplied/server/0644-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 92%
rename from patches/server/0644-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/unapplied/server/0644-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index d80840a79c..579dc34726 100644
--- a/patches/server/0644-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/unapplied/server/0644-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 666c6cb6f600973e1d84839aed715606279d4630..ace2cab310aa7d89e1b76bf5fdc9fd64f56b6cc7 100644
+index 7efe0cc24590966075ae84d19c3899a43f9adc2a..8fcb241e8d161c9fb024a2a0488f8c29784a74f1 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -725,6 +725,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0645-Add-packet-limiter-config.patch b/patches/unapplied/server/0645-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0645-Add-packet-limiter-config.patch
rename to patches/unapplied/server/0645-Add-packet-limiter-config.patch
diff --git a/patches/server/0646-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/unapplied/server/0646-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0646-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/unapplied/server/0646-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0647-Ensure-valid-vehicle-status.patch b/patches/unapplied/server/0647-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0647-Ensure-valid-vehicle-status.patch
rename to patches/unapplied/server/0647-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0648-Prevent-softlocked-end-exit-portal-generation.patch b/patches/unapplied/server/0648-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0648-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/unapplied/server/0648-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0649-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/unapplied/server/0649-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0649-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/unapplied/server/0649-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0650-Don-t-log-debug-logging-being-disabled.patch b/patches/unapplied/server/0650-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0650-Don-t-log-debug-logging-being-disabled.patch
rename to patches/unapplied/server/0650-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0651-fix-various-menus-with-empty-level-accesses.patch b/patches/unapplied/server/0651-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0651-fix-various-menus-with-empty-level-accesses.patch
rename to patches/unapplied/server/0651-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0652-Preserve-overstacked-loot.patch b/patches/unapplied/server/0652-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0652-Preserve-overstacked-loot.patch
rename to patches/unapplied/server/0652-Preserve-overstacked-loot.patch
diff --git a/patches/server/0653-Update-head-rotation-in-missing-places.patch b/patches/unapplied/server/0653-Update-head-rotation-in-missing-places.patch
similarity index 100%
rename from patches/server/0653-Update-head-rotation-in-missing-places.patch
rename to patches/unapplied/server/0653-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0654-prevent-unintended-light-block-manipulation.patch b/patches/unapplied/server/0654-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0654-prevent-unintended-light-block-manipulation.patch
rename to patches/unapplied/server/0654-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0655-Fix-CraftCriteria-defaults-map.patch b/patches/unapplied/server/0655-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0655-Fix-CraftCriteria-defaults-map.patch
rename to patches/unapplied/server/0655-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0656-Fix-upstreams-block-state-factories.patch b/patches/unapplied/server/0656-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0656-Fix-upstreams-block-state-factories.patch
rename to patches/unapplied/server/0656-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0657-Configurable-feature-seeds.patch b/patches/unapplied/server/0657-Configurable-feature-seeds.patch
similarity index 96%
rename from patches/server/0657-Configurable-feature-seeds.patch
rename to patches/unapplied/server/0657-Configurable-feature-seeds.patch
index 0cfc074f8f..bebeb4fc60 100644
--- a/patches/server/0657-Configurable-feature-seeds.patch
+++ b/patches/unapplied/server/0657-Configurable-feature-seeds.patch
@@ -19,7 +19,7 @@ index 49028463ba47e760281545c2f7597e3db8d6c453..7620c72a4c243cbeea245203ce03a97c
}
final Object val = config.get(key);
diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index a6d5b3fa7e3437e0aec54eec4079e9f3267c64b8..567103d635087bf894a8c0473baf03bdb5ff052f 100644
+index edd968686292237e95afdf99a291f501386144ef..d09d5192f0a571e9758e95dd5e1392a9caa88bde 100644
--- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
@@ -431,7 +431,14 @@ public abstract class ChunkGenerator {
diff --git a/patches/server/0658-Add-root-admin-user-detection.patch b/patches/unapplied/server/0658-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0658-Add-root-admin-user-detection.patch
rename to patches/unapplied/server/0658-Add-root-admin-user-detection.patch
diff --git a/patches/server/0659-Always-allow-item-changing-in-Fireball.patch b/patches/unapplied/server/0659-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0659-Always-allow-item-changing-in-Fireball.patch
rename to patches/unapplied/server/0659-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0660-don-t-attempt-to-teleport-dead-entities.patch b/patches/unapplied/server/0660-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0660-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/unapplied/server/0660-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0661-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/unapplied/server/0661-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0661-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/unapplied/server/0661-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0662-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/unapplied/server/0662-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0662-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/unapplied/server/0662-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0663-Fix-removing-recipes-from-RecipeIterator.patch b/patches/unapplied/server/0663-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0663-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/unapplied/server/0663-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0664-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/unapplied/server/0664-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0664-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/unapplied/server/0664-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0665-Hide-unnecessary-itemmeta-from-clients.patch b/patches/unapplied/server/0665-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 98%
rename from patches/server/0665-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/unapplied/server/0665-Hide-unnecessary-itemmeta-from-clients.patch
index 97005e3398..8f581ab2f3 100644
--- a/patches/server/0665-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/unapplied/server/0665-Hide-unnecessary-itemmeta-from-clients.patch
@@ -18,7 +18,7 @@ index a51564e8dce3c125ed5f05cc23548a05c1e79a95..d2c2075fb0378fd7ec148281d37d886c
}
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ace2cab310aa7d89e1b76bf5fdc9fd64f56b6cc7..cf173a2315f3a97a89dc2aabe81be285abe73603 100644
+index 8fcb241e8d161c9fb024a2a0488f8c29784a74f1..7127c6f163cc00eb439eb37665df3e1a4bf27cc2 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2565,8 +2565,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0666-Fix-Spigot-growth-modifiers.patch b/patches/unapplied/server/0666-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0666-Fix-Spigot-growth-modifiers.patch
rename to patches/unapplied/server/0666-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0667-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/unapplied/server/0667-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0667-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/unapplied/server/0667-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0668-Add-PlayerItemFrameChangeEvent.patch b/patches/unapplied/server/0668-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0668-Add-PlayerItemFrameChangeEvent.patch
rename to patches/unapplied/server/0668-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0669-Optimize-HashMapPalette.patch b/patches/unapplied/server/0669-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0669-Optimize-HashMapPalette.patch
rename to patches/unapplied/server/0669-Optimize-HashMapPalette.patch
diff --git a/patches/server/0670-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/unapplied/server/0670-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0670-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/unapplied/server/0670-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0671-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/unapplied/server/0671-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0671-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/unapplied/server/0671-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0672-Add-more-Campfire-API.patch b/patches/unapplied/server/0672-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0672-Add-more-Campfire-API.patch
rename to patches/unapplied/server/0672-Add-more-Campfire-API.patch
diff --git a/patches/server/0673-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/unapplied/server/0673-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0673-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/unapplied/server/0673-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0674-Forward-CraftEntity-in-teleport-command.patch b/patches/unapplied/server/0674-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0674-Forward-CraftEntity-in-teleport-command.patch
rename to patches/unapplied/server/0674-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0675-Improve-scoreboard-entries.patch b/patches/unapplied/server/0675-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0675-Improve-scoreboard-entries.patch
rename to patches/unapplied/server/0675-Improve-scoreboard-entries.patch
diff --git a/patches/server/0676-Entity-powdered-snow-API.patch b/patches/unapplied/server/0676-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0676-Entity-powdered-snow-API.patch
rename to patches/unapplied/server/0676-Entity-powdered-snow-API.patch
diff --git a/patches/server/0677-Add-API-for-item-entity-health.patch b/patches/unapplied/server/0677-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0677-Add-API-for-item-entity-health.patch
rename to patches/unapplied/server/0677-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0678-Configurable-max-block-light-for-monster-spawning.patch b/patches/unapplied/server/0678-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0678-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/unapplied/server/0678-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0679-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/unapplied/server/0679-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0679-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/unapplied/server/0679-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0680-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/unapplied/server/0680-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0680-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/unapplied/server/0680-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0681-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/unapplied/server/0681-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0681-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/unapplied/server/0681-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0682-Fix-bees-aging-inside-hives.patch b/patches/unapplied/server/0682-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0682-Fix-bees-aging-inside-hives.patch
rename to patches/unapplied/server/0682-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0683-Bucketable-API.patch b/patches/unapplied/server/0683-Bucketable-API.patch
similarity index 100%
rename from patches/server/0683-Bucketable-API.patch
rename to patches/unapplied/server/0683-Bucketable-API.patch
diff --git a/patches/server/0684-Validate-usernames.patch b/patches/unapplied/server/0684-Validate-usernames.patch
similarity index 100%
rename from patches/server/0684-Validate-usernames.patch
rename to patches/unapplied/server/0684-Validate-usernames.patch
diff --git a/patches/server/0685-Make-water-animal-spawn-height-configurable.patch b/patches/unapplied/server/0685-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0685-Make-water-animal-spawn-height-configurable.patch
rename to patches/unapplied/server/0685-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0686-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/unapplied/server/0686-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 98%
rename from patches/server/0686-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/unapplied/server/0686-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index d2d9b68707..9a987c53c6 100644
--- a/patches/server/0686-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/unapplied/server/0686-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fdda28bd6aa3a2d3079a383157b82ff825cc992d..82ee16f8efb5d32bf648d416010de557e2b90865 100644
+index 86283e9b7c3ad18e4deb8fcd3de624be92908c55..e367711dc3ef96280fe672f02e2ce99e43a5cd3c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -597,7 +597,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop
diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index 567103d635087bf894a8c0473baf03bdb5ff052f..f767c822a8e86ce689d40d12c4ef2db3829a97cc 100644
+index d09d5192f0a571e9758e95dd5e1392a9caa88bde..a7ac9a0c4966c2f9d2b325fa59e8792850d376e8 100644
--- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
@@ -568,7 +568,7 @@ public abstract class ChunkGenerator {
diff --git a/patches/server/0700-Implement-regenerateChunk.patch b/patches/unapplied/server/0700-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0700-Implement-regenerateChunk.patch
rename to patches/unapplied/server/0700-Implement-regenerateChunk.patch
diff --git a/patches/server/0701-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/unapplied/server/0701-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0701-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/unapplied/server/0701-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0702-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/unapplied/server/0702-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0702-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/unapplied/server/0702-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0703-Add-GameEvent-tags.patch b/patches/unapplied/server/0703-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0703-Add-GameEvent-tags.patch
rename to patches/unapplied/server/0703-Add-GameEvent-tags.patch
diff --git a/patches/server/0704-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/unapplied/server/0704-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 94%
rename from patches/server/0704-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/unapplied/server/0704-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 24d1f7815d..e2539627c2 100644
--- a/patches/server/0704-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/unapplied/server/0704-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
@@ -9,7 +9,7 @@ This might result in chunks loading far slower in the nether,
for example.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 82ee16f8efb5d32bf648d416010de557e2b90865..186bbc60f6e283aeb00e339c98c034e2268f160d 100644
+index e367711dc3ef96280fe672f02e2ce99e43a5cd3c..f32bddb777082e7db307c4691b88e037926174b5 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1296,6 +1296,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop serialized.gameMode = GameType.byId(buf.readVarInt()), (buf, entry) -> buf.writeVarInt(entry.gameMode().getId())),
UPDATE_LISTED((serialized, buf) -> serialized.listed = buf.readBoolean(), (buf, entry) -> buf.writeBoolean(entry.listed())),
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c9dab47fe3db73b31b40e071d37f1be63401c19d..69118af2a873f23f6543676db39263bfeb81b4f1 100644
+index f2b6c74317dbedaa983bb5d821255dc40e1c81e4..1de8ee39347a6f4c56c2d3aa0e32887b57b80524 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -286,6 +286,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0857-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/unapplied/server/0857-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 100%
rename from patches/server/0857-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/unapplied/server/0857-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0858-Use-array-for-gamerule-storage.patch b/patches/unapplied/server/0858-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0858-Use-array-for-gamerule-storage.patch
rename to patches/unapplied/server/0858-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0859-Fix-a-couple-of-upstream-bed-issues.patch b/patches/unapplied/server/0859-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 100%
rename from patches/server/0859-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/unapplied/server/0859-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0860-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/unapplied/server/0860-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 100%
rename from patches/server/0860-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/unapplied/server/0860-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0861-Add-Mob-Experience-reward-API.patch b/patches/unapplied/server/0861-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/server/0861-Add-Mob-Experience-reward-API.patch
rename to patches/unapplied/server/0861-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0862-Break-redstone-on-top-of-trap-doors-early.patch b/patches/unapplied/server/0862-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0862-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/unapplied/server/0862-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0863-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/unapplied/server/0863-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 95%
rename from patches/server/0863-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/unapplied/server/0863-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index 112f2214ae..ac37b3fe84 100644
--- a/patches/server/0863-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/unapplied/server/0863-Avoid-Lazy-Initialization-for-Enum-Fields.patch
@@ -7,7 +7,7 @@ This patch is meant to get rid of any instances of lazy initialization that Mine
This has the possibility to create race condition issues, and generally don't make sense to be lazily done anyways.
diff --git a/src/main/java/com/mojang/math/OctahedralGroup.java b/src/main/java/com/mojang/math/OctahedralGroup.java
-index 8af12b383bb80d1c0a12e1151030ab6e21c27e79..d2efe5e4f767f8316bc3915573bd1efcbcf20968 100644
+index 05d28a08c1fdf75221f5d774fe49d905840ae472..207f424b2bf5e0c48f33e4553c7c6019ef2dd009 100644
--- a/src/main/java/com/mojang/math/OctahedralGroup.java
+++ b/src/main/java/com/mojang/math/OctahedralGroup.java
@@ -110,6 +110,7 @@ public enum OctahedralGroup implements StringRepresentable {
diff --git a/patches/server/0864-More-accurate-isInOpenWater-impl.patch b/patches/unapplied/server/0864-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0864-More-accurate-isInOpenWater-impl.patch
rename to patches/unapplied/server/0864-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0865-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/unapplied/server/0865-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
similarity index 94%
rename from patches/server/0865-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
rename to patches/unapplied/server/0865-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
index 54ad4f456c..0731970718 100644
--- a/patches/server/0865-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
+++ b/patches/unapplied/server/0865-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
@@ -11,7 +11,7 @@ more than one Netty IO thread.
Fixes https://github.com/PaperMC/Folia/issues/11
diff --git a/src/main/java/net/minecraft/resources/RegistryOps.java b/src/main/java/net/minecraft/resources/RegistryOps.java
-index 3dc8333a5c17926679c79d5294a0e72199801c34..fafecd2f5aefd5e6fdc2b0c3674378f03f4dc4f2 100644
+index 0272fe45449785e8589b6e42fa454f2abfcc0476..dd8a6bd463e5c8fe69271663cb46b45b201ba59c 100644
--- a/src/main/java/net/minecraft/resources/RegistryOps.java
+++ b/src/main/java/net/minecraft/resources/RegistryOps.java
@@ -19,7 +19,10 @@ public class RegistryOps extends DelegatingOps {
diff --git a/patches/server/0866-Expand-PlayerItemMendEvent.patch b/patches/unapplied/server/0866-Expand-PlayerItemMendEvent.patch
similarity index 100%
rename from patches/server/0866-Expand-PlayerItemMendEvent.patch
rename to patches/unapplied/server/0866-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0867-Refresh-ProjectileSource-for-projectiles.patch b/patches/unapplied/server/0867-Refresh-ProjectileSource-for-projectiles.patch
similarity index 100%
rename from patches/server/0867-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/unapplied/server/0867-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0868-Add-transient-modifier-API.patch b/patches/unapplied/server/0868-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0868-Add-transient-modifier-API.patch
rename to patches/unapplied/server/0868-Add-transient-modifier-API.patch
diff --git a/patches/server/0869-Fix-block-place-logic.patch b/patches/unapplied/server/0869-Fix-block-place-logic.patch
similarity index 100%
rename from patches/server/0869-Fix-block-place-logic.patch
rename to patches/unapplied/server/0869-Fix-block-place-logic.patch
diff --git a/patches/server/0870-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/unapplied/server/0870-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
similarity index 100%
rename from patches/server/0870-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
rename to patches/unapplied/server/0870-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0871-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/unapplied/server/0871-Call-BlockGrowEvent-for-missing-blocks.patch
similarity index 100%
rename from patches/server/0871-Call-BlockGrowEvent-for-missing-blocks.patch
rename to patches/unapplied/server/0871-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0872-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/unapplied/server/0872-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
similarity index 100%
rename from patches/server/0872-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
rename to patches/unapplied/server/0872-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0873-fix-MapLike-spam-for-missing-key-selector.patch b/patches/unapplied/server/0873-fix-MapLike-spam-for-missing-key-selector.patch
similarity index 100%
rename from patches/server/0873-fix-MapLike-spam-for-missing-key-selector.patch
rename to patches/unapplied/server/0873-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0874-Fix-sniffer-removeExploredLocation.patch b/patches/unapplied/server/0874-Fix-sniffer-removeExploredLocation.patch
similarity index 100%
rename from patches/server/0874-Fix-sniffer-removeExploredLocation.patch
rename to patches/unapplied/server/0874-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0875-Add-method-to-remove-all-active-potion-effects.patch b/patches/unapplied/server/0875-Add-method-to-remove-all-active-potion-effects.patch
similarity index 100%
rename from patches/server/0875-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/unapplied/server/0875-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0876-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/unapplied/server/0876-Fix-incorrect-crafting-result-amount-for-fireworks.patch
similarity index 100%
rename from patches/server/0876-Fix-incorrect-crafting-result-amount-for-fireworks.patch
rename to patches/unapplied/server/0876-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0877-Add-event-for-player-editing-sign.patch b/patches/unapplied/server/0877-Add-event-for-player-editing-sign.patch
similarity index 100%
rename from patches/server/0877-Add-event-for-player-editing-sign.patch
rename to patches/unapplied/server/0877-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0878-Only-tick-item-frames-if-players-can-see-it.patch b/patches/unapplied/server/0878-Only-tick-item-frames-if-players-can-see-it.patch
similarity index 100%
rename from patches/server/0878-Only-tick-item-frames-if-players-can-see-it.patch
rename to patches/unapplied/server/0878-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0879-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/unapplied/server/0879-Fix-cmd-permission-levels-for-command-blocks.patch
similarity index 100%
rename from patches/server/0879-Fix-cmd-permission-levels-for-command-blocks.patch
rename to patches/unapplied/server/0879-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0880-Add-option-to-disable-block-updates.patch b/patches/unapplied/server/0880-Add-option-to-disable-block-updates.patch
similarity index 100%
rename from patches/server/0880-Add-option-to-disable-block-updates.patch
rename to patches/unapplied/server/0880-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0881-Call-missing-BlockDispenseEvent.patch b/patches/unapplied/server/0881-Call-missing-BlockDispenseEvent.patch
similarity index 100%
rename from patches/server/0881-Call-missing-BlockDispenseEvent.patch
rename to patches/unapplied/server/0881-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0882-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/unapplied/server/0882-Don-t-load-chunks-for-supporting-block-checks.patch
similarity index 100%
rename from patches/server/0882-Don-t-load-chunks-for-supporting-block-checks.patch
rename to patches/unapplied/server/0882-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0883-Optimize-player-lookups-for-beacons.patch b/patches/unapplied/server/0883-Optimize-player-lookups-for-beacons.patch
similarity index 100%
rename from patches/server/0883-Optimize-player-lookups-for-beacons.patch
rename to patches/unapplied/server/0883-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0884-Add-Sign-getInteractableSideFor.patch b/patches/unapplied/server/0884-Add-Sign-getInteractableSideFor.patch
similarity index 100%
rename from patches/server/0884-Add-Sign-getInteractableSideFor.patch
rename to patches/unapplied/server/0884-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0885-Array-backed-synched-entity-data.patch b/patches/unapplied/server/0885-Array-backed-synched-entity-data.patch
similarity index 100%
rename from patches/server/0885-Array-backed-synched-entity-data.patch
rename to patches/unapplied/server/0885-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0886-fix-item-meta-for-tadpole-buckets.patch b/patches/unapplied/server/0886-fix-item-meta-for-tadpole-buckets.patch
similarity index 100%
rename from patches/server/0886-fix-item-meta-for-tadpole-buckets.patch
rename to patches/unapplied/server/0886-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0887-Fix-BanList-API.patch b/patches/unapplied/server/0887-Fix-BanList-API.patch
similarity index 100%
rename from patches/server/0887-Fix-BanList-API.patch
rename to patches/unapplied/server/0887-Fix-BanList-API.patch
diff --git a/patches/server/0888-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/unapplied/server/0888-Determine-lava-and-water-fluid-explosion-resistance-.patch
similarity index 100%
rename from patches/server/0888-Determine-lava-and-water-fluid-explosion-resistance-.patch
rename to patches/unapplied/server/0888-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0889-Fix-possible-NPE-on-painting-creation.patch b/patches/unapplied/server/0889-Fix-possible-NPE-on-painting-creation.patch
similarity index 100%
rename from patches/server/0889-Fix-possible-NPE-on-painting-creation.patch
rename to patches/unapplied/server/0889-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0890-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/unapplied/server/0890-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0890-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/unapplied/server/0890-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0891-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/unapplied/server/0891-ExperienceOrb-should-call-EntitySpawnEvent.patch
similarity index 100%
rename from patches/server/0891-ExperienceOrb-should-call-EntitySpawnEvent.patch
rename to patches/unapplied/server/0891-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0892-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/unapplied/server/0892-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
similarity index 100%
rename from patches/server/0892-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
rename to patches/unapplied/server/0892-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0893-Add-whitelist-events.patch b/patches/unapplied/server/0893-Add-whitelist-events.patch
similarity index 100%
rename from patches/server/0893-Add-whitelist-events.patch
rename to patches/unapplied/server/0893-Add-whitelist-events.patch
diff --git a/patches/server/0894-Implement-PlayerFailMoveEvent.patch b/patches/unapplied/server/0894-Implement-PlayerFailMoveEvent.patch
similarity index 98%
rename from patches/server/0894-Implement-PlayerFailMoveEvent.patch
rename to patches/unapplied/server/0894-Implement-PlayerFailMoveEvent.patch
index 67cf55983c..3d263f8ee9 100644
--- a/patches/server/0894-Implement-PlayerFailMoveEvent.patch
+++ b/patches/unapplied/server/0894-Implement-PlayerFailMoveEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerFailMoveEvent
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 69118af2a873f23f6543676db39263bfeb81b4f1..93f5ec2c48bf4bdd4afc1e07ffcf1a34387ce6ac 100644
+index 1de8ee39347a6f4c56c2d3aa0e32887b57b80524..91e9e8a62ae25360ad82ab12ef07f8a51a2665ca 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1279,8 +1279,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0895-Folia-scheduler-and-owned-region-API.patch b/patches/unapplied/server/0895-Folia-scheduler-and-owned-region-API.patch
similarity index 99%
rename from patches/server/0895-Folia-scheduler-and-owned-region-API.patch
rename to patches/unapplied/server/0895-Folia-scheduler-and-owned-region-API.patch
index ab7ab5a341..e7344d7653 100644
--- a/patches/server/0895-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/unapplied/server/0895-Folia-scheduler-and-owned-region-API.patch
@@ -1148,7 +1148,7 @@ index 0000000000000000000000000000000000000000..d306f911757a4d556c82c0070d4837db
+ }
+}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bfee202e1dc8ea875b9d2b4e8c3b0be3f6d94b26..28645a835a169029b734262a9f42751caa52c4c9 100644
+index a540c744ca88884207c4520794091c01c1c9f50e..882b6effa39b62172914b41af54e54c2890480fb 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1497,6 +1497,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop {
diff --git a/patches/server/0979-Starlight.patch b/patches/unapplied/server/0979-Starlight.patch
similarity index 100%
rename from patches/server/0979-Starlight.patch
rename to patches/unapplied/server/0979-Starlight.patch
diff --git a/patches/server/0980-Rewrite-chunk-system.patch b/patches/unapplied/server/0980-Rewrite-chunk-system.patch
similarity index 99%
rename from patches/server/0980-Rewrite-chunk-system.patch
rename to patches/unapplied/server/0980-Rewrite-chunk-system.patch
index e013a3c5f4..541f2b8723 100644
--- a/patches/server/0980-Rewrite-chunk-system.patch
+++ b/patches/unapplied/server/0980-Rewrite-chunk-system.patch
@@ -19951,7 +19951,7 @@ index ced67cf88c91c5270a0060a7307f36739237cbb2..dab86988686cf7c926b7432b8a4afffd
@Nullable default ChunkAccess getChunkIfLoadedImmediately(BlockPos pos) { return this.getChunkIfLoadedImmediately(pos.getX() >> 4, pos.getZ() >> 4);}
diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index b26a4eb4951e87f891b59028d98b8ffba8e103a8..b8b78494449c0cd638f9706a803dc54e184d981f 100644
+index 84a2a5384a8a31eff5363e6391c9a5187212ff36..4c03297fb523ef59cd9d11edbed437398e562a00 100644
--- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
@@ -114,7 +114,7 @@ public abstract class ChunkGenerator {
diff --git a/patches/server/0981-incremental-chunk-and-player-saving.patch b/patches/unapplied/server/0981-incremental-chunk-and-player-saving.patch
similarity index 98%
rename from patches/server/0981-incremental-chunk-and-player-saving.patch
rename to patches/unapplied/server/0981-incremental-chunk-and-player-saving.patch
index ee962a9466..33d6eb0a5f 100644
--- a/patches/server/0981-incremental-chunk-and-player-saving.patch
+++ b/patches/unapplied/server/0981-incremental-chunk-and-player-saving.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] incremental chunk and player saving
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 56d579e64b367dd21b2909eb0dbc1d7686d0c3d0..c8a2686f1e60a8c1fb56ce7b5d3e2ba62ec3a987 100644
+index 03d566c3e6d7541487ea79ed868aa7334793df3b..54d6e197bd6357bf2d31d8d5d1cb3707d22ef03e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -908,7 +908,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop
diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
-index 9c51c4d12bac588002f530f484ee89b094269349..761a8d4fb47f9bffdf9ca76fbae1003e8ae46a02 100644
+index 454bec4f8843e7e4e42cd8a8132b557ead292dcc..76bde683d193b37e563a67c1c7b9bdcf17d64524 100644
--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
+++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
@@ -24,6 +24,14 @@ public class ClientboundLevelChunkPacketData {
diff --git a/patches/server/1030-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/unapplied/server/1030-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/1030-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/unapplied/server/1030-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/1031-Add-ShulkerDuplicateEvent.patch b/patches/unapplied/server/1031-Add-ShulkerDuplicateEvent.patch
similarity index 100%
rename from patches/server/1031-Add-ShulkerDuplicateEvent.patch
rename to patches/unapplied/server/1031-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/server/1032-Add-api-for-spawn-egg-texture-colors.patch b/patches/unapplied/server/1032-Add-api-for-spawn-egg-texture-colors.patch
similarity index 100%
rename from patches/server/1032-Add-api-for-spawn-egg-texture-colors.patch
rename to patches/unapplied/server/1032-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/server/1033-Disable-memory-reserve-allocating.patch b/patches/unapplied/server/1033-Disable-memory-reserve-allocating.patch
similarity index 100%
rename from patches/server/1033-Disable-memory-reserve-allocating.patch
rename to patches/unapplied/server/1033-Disable-memory-reserve-allocating.patch
diff --git a/patches/server/1034-Improve-tag-parser-handling.patch b/patches/unapplied/server/1034-Improve-tag-parser-handling.patch
similarity index 99%
rename from patches/server/1034-Improve-tag-parser-handling.patch
rename to patches/unapplied/server/1034-Improve-tag-parser-handling.patch
index 30bd53f874..78cf8189d3 100644
--- a/patches/server/1034-Improve-tag-parser-handling.patch
+++ b/patches/unapplied/server/1034-Improve-tag-parser-handling.patch
@@ -169,7 +169,7 @@ index a5e438a834826161c52ca9db57d234d9ff80a591..4766994cce060564370b0d24836a7da8
@Override
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 98496bcc7ab9adde3fdc8b2cd9eaeceee99e28b4..860d33ac56680babd87358b1d7d2216dac3f7865 100644
+index b8db3c3a5870e9d7dbba38caf7c9e1c1f3849bde..2ad17823bf442ce0455227b64e5d3bb10d0ee2c1 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -777,6 +777,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/1035-Add-Lifecycle-Event-system.patch b/patches/unapplied/server/1035-Add-Lifecycle-Event-system.patch
similarity index 100%
rename from patches/server/1035-Add-Lifecycle-Event-system.patch
rename to patches/unapplied/server/1035-Add-Lifecycle-Event-system.patch
diff --git a/patches/server/1036-Conduit-API.patch b/patches/unapplied/server/1036-Conduit-API.patch
similarity index 100%
rename from patches/server/1036-Conduit-API.patch
rename to patches/unapplied/server/1036-Conduit-API.patch
diff --git a/patches/server/1037-ItemStack-Tooltip-API.patch b/patches/unapplied/server/1037-ItemStack-Tooltip-API.patch
similarity index 100%
rename from patches/server/1037-ItemStack-Tooltip-API.patch
rename to patches/unapplied/server/1037-ItemStack-Tooltip-API.patch
diff --git a/patches/server/1038-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/unapplied/server/1038-Fix-possible-StackOverflowError-for-some-dispenses.patch
similarity index 100%
rename from patches/server/1038-Fix-possible-StackOverflowError-for-some-dispenses.patch
rename to patches/unapplied/server/1038-Fix-possible-StackOverflowError-for-some-dispenses.patch
diff --git a/patches/server/1039-Properly-track-the-changed-item-from-dispense-events.patch b/patches/unapplied/server/1039-Properly-track-the-changed-item-from-dispense-events.patch
similarity index 100%
rename from patches/server/1039-Properly-track-the-changed-item-from-dispense-events.patch
rename to patches/unapplied/server/1039-Properly-track-the-changed-item-from-dispense-events.patch
diff --git a/patches/server/1040-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/unapplied/server/1040-Add-getChunkSnapshot-includeLightData-parameter.patch
similarity index 100%
rename from patches/server/1040-Add-getChunkSnapshot-includeLightData-parameter.patch
rename to patches/unapplied/server/1040-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/server/1041-Add-FluidState-API.patch b/patches/unapplied/server/1041-Add-FluidState-API.patch
similarity index 100%
rename from patches/server/1041-Add-FluidState-API.patch
rename to patches/unapplied/server/1041-Add-FluidState-API.patch
diff --git a/patches/server/1042-add-number-format-api.patch b/patches/unapplied/server/1042-add-number-format-api.patch
similarity index 100%
rename from patches/server/1042-add-number-format-api.patch
rename to patches/unapplied/server/1042-add-number-format-api.patch
diff --git a/patches/server/1043-check-if-itemstack-is-stackable-first.patch b/patches/unapplied/server/1043-check-if-itemstack-is-stackable-first.patch
similarity index 100%
rename from patches/server/1043-check-if-itemstack-is-stackable-first.patch
rename to patches/unapplied/server/1043-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/server/1044-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/unapplied/server/1044-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
similarity index 100%
rename from patches/server/1044-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
rename to patches/unapplied/server/1044-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
diff --git a/patches/server/1045-improve-BanList-types.patch b/patches/unapplied/server/1045-improve-BanList-types.patch
similarity index 100%
rename from patches/server/1045-improve-BanList-types.patch
rename to patches/unapplied/server/1045-improve-BanList-types.patch
diff --git a/patches/server/1046-Configurable-max-block-fluid-ticks.patch b/patches/unapplied/server/1046-Configurable-max-block-fluid-ticks.patch
similarity index 100%
rename from patches/server/1046-Configurable-max-block-fluid-ticks.patch
rename to patches/unapplied/server/1046-Configurable-max-block-fluid-ticks.patch
diff --git a/patches/server/1047-disable-forced-empty-world-ticks.patch b/patches/unapplied/server/1047-disable-forced-empty-world-ticks.patch
similarity index 100%
rename from patches/server/1047-disable-forced-empty-world-ticks.patch
rename to patches/unapplied/server/1047-disable-forced-empty-world-ticks.patch
diff --git a/patches/server/1048-Suspicious-Effect-Entry-API.patch b/patches/unapplied/server/1048-Suspicious-Effect-Entry-API.patch
similarity index 100%
rename from patches/server/1048-Suspicious-Effect-Entry-API.patch
rename to patches/unapplied/server/1048-Suspicious-Effect-Entry-API.patch
diff --git a/patches/server/1049-Per-world-ticks-per-spawn-settings.patch b/patches/unapplied/server/1049-Per-world-ticks-per-spawn-settings.patch
similarity index 100%
rename from patches/server/1049-Per-world-ticks-per-spawn-settings.patch
rename to patches/unapplied/server/1049-Per-world-ticks-per-spawn-settings.patch
diff --git a/patches/server/1050-Add-onboarding-message-for-initial-server-start.patch b/patches/unapplied/server/1050-Add-onboarding-message-for-initial-server-start.patch
similarity index 96%
rename from patches/server/1050-Add-onboarding-message-for-initial-server-start.patch
rename to patches/unapplied/server/1050-Add-onboarding-message-for-initial-server-start.patch
index 7769ecafe8..6210b12485 100644
--- a/patches/server/1050-Add-onboarding-message-for-initial-server-start.patch
+++ b/patches/unapplied/server/1050-Add-onboarding-message-for-initial-server-start.patch
@@ -17,7 +17,7 @@ index c01b4393439838976965823298f12e4762e72eff..218bf89fd7583d6db9f64754c4db8fcc
node = loader.load();
this.verifyGlobalConfigVersion(node);
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index d00fc39b19c02895553f40bf5f62daa1dd50d59c..0cc2307636279915c1f8529e62174cc696e185ee 100644
+index 31f34ac1c70df3ef6eb6f6dfd0f870b1b275adfa..30fe1c0645a07d663b08c0f988a1ab3a750bf7c4 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -25,6 +25,7 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -29,7 +29,7 @@ index d00fc39b19c02895553f40bf5f62daa1dd50d59c..0cc2307636279915c1f8529e62174cc6
return instance;
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5934d8fc3d0a96f72f41193102ac58bd87f82b57..c8772c773f9933ed1d1debfe707af4373c458152 100644
+index f03f6922d15541c5491e5b37a3efa7ef0abef211..2dc07e5ef249636e85ad9c78e3729e9e066a8fe8 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1155,6 +1155,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop