diff --git a/patches/server/0135-Add-system-property-to-disable-book-size-limits.patch b/patches/removed/1.17/No longer needed/0135-Add-system-property-to-disable-book-size-limits.patch similarity index 94% rename from patches/server/0135-Add-system-property-to-disable-book-size-limits.patch rename to patches/removed/1.17/No longer needed/0135-Add-system-property-to-disable-book-size-limits.patch index e720e04c6..e3adba196 100644 --- a/patches/server/0135-Add-system-property-to-disable-book-size-limits.patch +++ b/patches/removed/1.17/No longer needed/0135-Add-system-property-to-disable-book-size-limits.patch @@ -10,6 +10,8 @@ Disables the security limits on books entirely, allowing plugins AND players to make books with as much data as they want. Do not use this without limiting incoming data from packets in some other way. +Removed in 1.17: It was from a different time before books were as jank as they are now. As time has gone on they've only proven to be worse and worse. + diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java index a33dd184ea51df7e59ed08e5e2b0ea4ed9dadff5..1d94d285951faa98ff1f70c3c5330dfaa77cb691 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java diff --git a/patches/server/0136-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/0135-Add-option-to-make-parrots-stay-on-shoulders-despite.patch similarity index 97% rename from patches/server/0136-Add-option-to-make-parrots-stay-on-shoulders-despite.patch rename to patches/server/0135-Add-option-to-make-parrots-stay-on-shoulders-despite.patch index 5a0818fc2..c67af4251 100644 --- a/patches/server/0136-Add-option-to-make-parrots-stay-on-shoulders-despite.patch +++ b/patches/server/0135-Add-option-to-make-parrots-stay-on-shoulders-despite.patch @@ -26,7 +26,7 @@ index c611b5a63498f5ad1f50a75ccd5d7299e27df7e3..9d1cddc6038f0fd0286e4a32013ae98f + } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a6891c43b674919eecaac5e826b4d979478b300c..bb58cf52e69258a8c59b595f5fa28ced562965f3 100644 +index 079b3c124308c2711ab76506c856d95e2ac81c3a..98640f6000067b49e1c15740d45dc29e62b7f249 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2057,6 +2057,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0137-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/server/0136-Add-configuration-option-to-prevent-player-names-fro.patch similarity index 100% rename from patches/server/0137-Add-configuration-option-to-prevent-player-names-fro.patch rename to patches/server/0136-Add-configuration-option-to-prevent-player-names-fro.patch diff --git a/patches/server/0138-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch similarity index 98% rename from patches/server/0138-Use-TerminalConsoleAppender-for-console-improvements.patch rename to patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch index 57fa6f2e6..da1ff9938 100644 --- a/patches/server/0138-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -19,7 +19,7 @@ Other changes: configuration diff --git a/build.gradle.kts b/build.gradle.kts -index 3064f56ecb24415be2662aa1bcfbc5facfdb86dc..a3e4d9d5a1829533f1419f9ca124c5209a489938 100644 +index ffb7b25b01bc26e3234358e39633c7f7578e018d..a85b1922391bd9aa121a3654f0095c9523e7fbd7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,7 +21,17 @@ repositories { @@ -112,7 +112,7 @@ index 0000000000000000000000000000000000000000..685deaa0e5d1ddc13e3a7c0471b1cfcf + +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 220ead6455587a07375b6e86913865c6b590a87d..d86c5cb6fa9c31db90c6392cd8baf5823b6c32b4 100644 +index 84067073ebb9852fcca0c290b5ca916b099707f1..151d08104ed390905becda5f7ba16c8f933cd3d0 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -12,6 +12,7 @@ import com.mojang.datafixers.DataFixer; @@ -278,7 +278,7 @@ index 8bd458b8995c9019b5ae85eab062df44e9424703..79fe58b09c9e0870a5ab55bc21b8ab93 @Override public PluginCommand getPluginCommand(String name) { diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 6985e8dc3d520eb65ae7d885138be81836452c01..b4bcd34123968b3930bb330f7c2abd9b5518fa31 100644 +index 213ff112be27f02c3742265cea6478a6f8130c99..787db22e4d7df30ccf3d92297fbd2f08ff87beb5 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -12,7 +12,7 @@ import java.util.logging.Level; diff --git a/patches/server/0139-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/server/0138-provide-a-configurable-option-to-disable-creeper-lin.patch similarity index 100% rename from patches/server/0139-provide-a-configurable-option-to-disable-creeper-lin.patch rename to patches/server/0138-provide-a-configurable-option-to-disable-creeper-lin.patch diff --git a/patches/server/0140-Item-canEntityPickup.patch b/patches/server/0139-Item-canEntityPickup.patch similarity index 96% rename from patches/server/0140-Item-canEntityPickup.patch rename to patches/server/0139-Item-canEntityPickup.patch index 0d7557f5b..7f8bbcc2f 100644 --- a/patches/server/0140-Item-canEntityPickup.patch +++ b/patches/server/0139-Item-canEntityPickup.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Item#canEntityPickup diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index ac0f2d98a8b2f515696a6e3959b8ff4ff05ba19b..61c9b89b6ef41cde465d84f75f2dc6ef07048cc4 100644 +index 18ea26c8e17da03f35c3fd0788a385cc492ff544..85633cd1718783cffe03f750da1c17270eeb4cdd 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -614,6 +614,11 @@ public abstract class Mob extends LivingEntity { diff --git a/patches/server/0141-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/server/0140-PlayerPickupItemEvent-setFlyAtPlayer.patch similarity index 100% rename from patches/server/0141-PlayerPickupItemEvent-setFlyAtPlayer.patch rename to patches/server/0140-PlayerPickupItemEvent-setFlyAtPlayer.patch diff --git a/patches/server/0142-PlayerAttemptPickupItemEvent.patch b/patches/server/0141-PlayerAttemptPickupItemEvent.patch similarity index 100% rename from patches/server/0142-PlayerAttemptPickupItemEvent.patch rename to patches/server/0141-PlayerAttemptPickupItemEvent.patch diff --git a/patches/server/0143-Add-UnknownCommandEvent.patch b/patches/server/0142-Add-UnknownCommandEvent.patch similarity index 100% rename from patches/server/0143-Add-UnknownCommandEvent.patch rename to patches/server/0142-Add-UnknownCommandEvent.patch diff --git a/patches/server/0144-Basic-PlayerProfile-API.patch b/patches/server/0143-Basic-PlayerProfile-API.patch similarity index 99% rename from patches/server/0144-Basic-PlayerProfile-API.patch rename to patches/server/0143-Basic-PlayerProfile-API.patch index 2cc20ab20..06f1a60c3 100644 --- a/patches/server/0144-Basic-PlayerProfile-API.patch +++ b/patches/server/0143-Basic-PlayerProfile-API.patch @@ -539,7 +539,7 @@ index 2f25e4c26f2f418de738ba2fcf7f2485bb2dda3c..46972308cf399ed02c450bc2d45b4dc8 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -index b19d50bbe6c944ff66230ac013178bd036a438c8..5e345224e698bd80133dc194385c033369a60a33 100644 +index 9405812b8c308d70de1e26ba55500301b24ecc3c..490df0dcfd0e1e0ab05943410493522f86444ef8 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java @@ -80,6 +80,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { diff --git a/patches/server/0145-Shoulder-Entities-Release-API.patch b/patches/server/0144-Shoulder-Entities-Release-API.patch similarity index 100% rename from patches/server/0145-Shoulder-Entities-Release-API.patch rename to patches/server/0144-Shoulder-Entities-Release-API.patch diff --git a/patches/server/0146-Profile-Lookup-Events.patch b/patches/server/0145-Profile-Lookup-Events.patch similarity index 100% rename from patches/server/0146-Profile-Lookup-Events.patch rename to patches/server/0145-Profile-Lookup-Events.patch diff --git a/patches/server/0147-Block-player-logins-during-server-shutdown.patch b/patches/server/0146-Block-player-logins-during-server-shutdown.patch similarity index 100% rename from patches/server/0147-Block-player-logins-during-server-shutdown.patch rename to patches/server/0146-Block-player-logins-during-server-shutdown.patch diff --git a/patches/server/0148-Entity-fromMobSpawner.patch b/patches/server/0147-Entity-fromMobSpawner.patch similarity index 100% rename from patches/server/0148-Entity-fromMobSpawner.patch rename to patches/server/0147-Entity-fromMobSpawner.patch diff --git a/patches/server/0149-Improve-the-Saddle-API-for-Horses.patch b/patches/server/0148-Improve-the-Saddle-API-for-Horses.patch similarity index 100% rename from patches/server/0149-Improve-the-Saddle-API-for-Horses.patch rename to patches/server/0148-Improve-the-Saddle-API-for-Horses.patch diff --git a/patches/server/0150-Implement-ensureServerConversions-API.patch b/patches/server/0149-Implement-ensureServerConversions-API.patch similarity index 100% rename from patches/server/0150-Implement-ensureServerConversions-API.patch rename to patches/server/0149-Implement-ensureServerConversions-API.patch diff --git a/patches/server/0151-Implement-getI18NDisplayName.patch b/patches/server/0150-Implement-getI18NDisplayName.patch similarity index 100% rename from patches/server/0151-Implement-getI18NDisplayName.patch rename to patches/server/0150-Implement-getI18NDisplayName.patch diff --git a/patches/server/0152-ProfileWhitelistVerifyEvent.patch b/patches/server/0151-ProfileWhitelistVerifyEvent.patch similarity index 100% rename from patches/server/0152-ProfileWhitelistVerifyEvent.patch rename to patches/server/0151-ProfileWhitelistVerifyEvent.patch diff --git a/patches/server/0153-Fix-this-stupid-bullshit.patch b/patches/server/0152-Fix-this-stupid-bullshit.patch similarity index 100% rename from patches/server/0153-Fix-this-stupid-bullshit.patch rename to patches/server/0152-Fix-this-stupid-bullshit.patch diff --git a/patches/server/0154-LivingEntity-setKiller.patch b/patches/server/0153-LivingEntity-setKiller.patch similarity index 100% rename from patches/server/0154-LivingEntity-setKiller.patch rename to patches/server/0153-LivingEntity-setKiller.patch diff --git a/patches/server/0155-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch similarity index 100% rename from patches/server/0155-Ocelot-despawns-should-honor-nametags-and-leash.patch rename to patches/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch diff --git a/patches/server/0156-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch similarity index 100% rename from patches/server/0156-Reset-spawner-timer-when-spawner-event-is-cancelled.patch rename to patches/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch diff --git a/patches/server/0157-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch similarity index 100% rename from patches/server/0157-Allow-specifying-a-custom-authentication-servers-dow.patch rename to patches/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch diff --git a/patches/server/0158-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch similarity index 97% rename from patches/server/0158-Handle-plugin-prefixes-using-Log4J-configuration.patch rename to patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch index 1d909e5a1..ed51cc127 100644 --- a/patches/server/0158-Handle-plugin-prefixes-using-Log4J-configuration.patch +++ b/patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch @@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing the plugin logger. diff --git a/build.gradle.kts b/build.gradle.kts -index f82546e7bb2b10b33e45f547ca4eb4e38ebab568..2946f2bd0b12846929c8d708cabe019c2bbf2297 100644 +index a85b1922391bd9aa121a3654f0095c9523e7fbd7..55915452beff1f8b6b9a44cf2a6d208dda6c3d8d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -30,7 +30,7 @@ dependencies { diff --git a/patches/server/0159-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch similarity index 100% rename from patches/server/0159-Improve-Log4J-Configuration-Plugin-Loggers.patch rename to patches/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch diff --git a/patches/server/0160-Add-PlayerJumpEvent.patch b/patches/server/0159-Add-PlayerJumpEvent.patch similarity index 96% rename from patches/server/0160-Add-PlayerJumpEvent.patch rename to patches/server/0159-Add-PlayerJumpEvent.patch index 97514757b..e793aceb4 100644 --- a/patches/server/0160-Add-PlayerJumpEvent.patch +++ b/patches/server/0159-Add-PlayerJumpEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerJumpEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index bb58cf52e69258a8c59b595f5fa28ced562965f3..24f6aeb862c9384ec11132cdf14ca73ee0762e2e 100644 +index 98640f6000067b49e1c15740d45dc29e62b7f249..9255e3d89385fac82a1a2f27bd915cbbd19f69e7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1187,7 +1187,34 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0161-handle-PacketPlayInKeepAlive-async.patch b/patches/server/0160-handle-PacketPlayInKeepAlive-async.patch similarity index 95% rename from patches/server/0161-handle-PacketPlayInKeepAlive-async.patch rename to patches/server/0160-handle-PacketPlayInKeepAlive-async.patch index 78fe63dd7..520fae314 100644 --- a/patches/server/0161-handle-PacketPlayInKeepAlive-async.patch +++ b/patches/server/0160-handle-PacketPlayInKeepAlive-async.patch @@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing random disconnections for clients. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 24f6aeb862c9384ec11132cdf14ca73ee0762e2e..f188a55fda95abd5ccf9119ed4ab772841128d74 100644 +index 9255e3d89385fac82a1a2f27bd915cbbd19f69e7..20084d956082d4656f50c4e5e5f2b1c1a9cb9cbc 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2781,14 +2781,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0162-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch similarity index 97% rename from patches/server/0162-Expose-client-protocol-version-and-virtual-host.patch rename to patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch index d1ccdfcf6..f982445fb 100644 --- a/patches/server/0162-Expose-client-protocol-version-and-virtual-host.patch +++ b/patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch @@ -90,7 +90,7 @@ index c4ba069f5124ec151e05813beddf293fddc3b804..484221e5a9c246aa91e0eacef3911b0e @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ea7a937dfd0769d734a056709d3af9d2f2ee5332..7badc90ec9e3b2dfffac6601e432c41224b701f6 100644 +index 08be81ecd34fa2f0289b10179ccc788307a09813..6549ffa087f9955849024fa62cfca9e91cbecf30 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -192,6 +192,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0163-revert-serverside-behavior-of-keepalives.patch b/patches/server/0162-revert-serverside-behavior-of-keepalives.patch similarity index 97% rename from patches/server/0163-revert-serverside-behavior-of-keepalives.patch rename to patches/server/0162-revert-serverside-behavior-of-keepalives.patch index d5ab2c7b9..7b5d47902 100644 --- a/patches/server/0163-revert-serverside-behavior-of-keepalives.patch +++ b/patches/server/0162-revert-serverside-behavior-of-keepalives.patch @@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients, at the cost of dead connections being kept open for longer. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f188a55fda95abd5ccf9119ed4ab772841128d74..c2f614b64482be75b28d47e79b0531a9143a157d 100644 +index 20084d956082d4656f50c4e5e5f2b1c1a9cb9cbc..a679b30076cec74976cd04a7fab737fe88a83329 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -222,9 +222,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0164-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch similarity index 100% rename from patches/server/0164-Send-attack-SoundEffects-only-to-players-who-can-see.patch rename to patches/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch diff --git a/patches/server/0165-Add-PlayerArmorChangeEvent.patch b/patches/server/0164-Add-PlayerArmorChangeEvent.patch similarity index 100% rename from patches/server/0165-Add-PlayerArmorChangeEvent.patch rename to patches/server/0164-Add-PlayerArmorChangeEvent.patch diff --git a/patches/server/0166-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch similarity index 100% rename from patches/server/0166-Prevent-logins-from-being-processed-when-the-player-.patch rename to patches/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch diff --git a/patches/server/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch similarity index 100% rename from patches/server/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch rename to patches/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch diff --git a/patches/server/0168-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0167-use-CB-BlockState-implementations-for-captured-block.patch similarity index 97% rename from patches/server/0168-use-CB-BlockState-implementations-for-captured-block.patch rename to patches/server/0167-use-CB-BlockState-implementations-for-captured-block.patch index c55c099b4..9c171ddcf 100644 --- a/patches/server/0168-use-CB-BlockState-implementations-for-captured-block.patch +++ b/patches/server/0167-use-CB-BlockState-implementations-for-captured-block.patch @@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping information on restoration when the event is cancelled. diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index e8ec98aa4598af6733b94a58a196190c9e0839d2..e9e694286bce719b825a37939fe8ab90a5010819 100644 +index f8554943783754618bc04cbbe7df61cebfc98b80..4e7644f875b8ed10cb402e5e1c8b71b4842e0e40 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -140,7 +140,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0169-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch similarity index 100% rename from patches/server/0169-API-to-get-a-BlockState-without-a-snapshot.patch rename to patches/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch diff --git a/patches/server/0170-AsyncTabCompleteEvent.patch b/patches/server/0169-AsyncTabCompleteEvent.patch similarity index 98% rename from patches/server/0170-AsyncTabCompleteEvent.patch rename to patches/server/0169-AsyncTabCompleteEvent.patch index d51ba56fd..484dcf3b8 100644 --- a/patches/server/0170-AsyncTabCompleteEvent.patch +++ b/patches/server/0169-AsyncTabCompleteEvent.patch @@ -14,7 +14,7 @@ completion, such as offline players. Also adds isCommand and getLocation to the sync TabCompleteEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c2f614b64482be75b28d47e79b0531a9143a157d..413bf8504821d4605e940f865332e8dd77acb436 100644 +index a679b30076cec74976cd04a7fab737fe88a83329..92f6f51d3642e1e8bcdb400da87f96ecf20c3218 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -703,10 +703,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0171-PlayerPickupExperienceEvent.patch b/patches/server/0170-PlayerPickupExperienceEvent.patch similarity index 92% rename from patches/server/0171-PlayerPickupExperienceEvent.patch rename to patches/server/0170-PlayerPickupExperienceEvent.patch index 6787576f7..ab6fa1fa3 100644 --- a/patches/server/0171-PlayerPickupExperienceEvent.patch +++ b/patches/server/0170-PlayerPickupExperienceEvent.patch @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerPickupExperienceEvent Allows plugins to cancel a player picking up an experience orb diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java -index 9662104a85faff2cdafd8cf001a8222182b56073..4a6a588eeeee3aa7d33d4b4545e9b8bdf043e567 100644 +index cb0194d688ae176e0fba6c48cf59a51ceb1a5c4e..628407ad2f8fd01850dd4f9e25799bcd6a93961d 100644 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java @@ -300,7 +300,7 @@ public class ExperienceOrb extends Entity { diff --git a/patches/server/0172-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0171-Ability-to-apply-mending-to-XP-API.patch similarity index 100% rename from patches/server/0172-Ability-to-apply-mending-to-XP-API.patch rename to patches/server/0171-Ability-to-apply-mending-to-XP-API.patch diff --git a/patches/server/0173-Make-max-squid-spawn-height-configurable.patch b/patches/server/0172-Make-max-squid-spawn-height-configurable.patch similarity index 100% rename from patches/server/0173-Make-max-squid-spawn-height-configurable.patch rename to patches/server/0172-Make-max-squid-spawn-height-configurable.patch diff --git a/patches/server/0174-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0173-PlayerNaturallySpawnCreaturesEvent.patch similarity index 96% rename from patches/server/0174-PlayerNaturallySpawnCreaturesEvent.patch rename to patches/server/0173-PlayerNaturallySpawnCreaturesEvent.patch index 8f82380ee..06c420818 100644 --- a/patches/server/0174-PlayerNaturallySpawnCreaturesEvent.patch +++ b/patches/server/0173-PlayerNaturallySpawnCreaturesEvent.patch @@ -9,7 +9,7 @@ from triggering monster spawns on a server. Also a highly more effecient way to blanket block spawns in a world diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index f4f0982aa11da0b5bf88a42c02e86f652f8ea615..dd9cae17aa9ec02e25642a1a45409bec7fb1da91 100644 +index 229e08a3fd8b4fc026ff49af9d163ea26d878bd4..94c5577a887ab4801dae5a1a0accd4b2f448bcc2 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -974,11 +974,21 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -36,7 +36,7 @@ index f4f0982aa11da0b5bf88a42c02e86f652f8ea615..dd9cae17aa9ec02e25642a1a45409bec }); } diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 8746654a1c1b3b6cb1cabb468c0498aada17d517..bd937505244cc9305611815a9274f91395d3a8f8 100644 +index e3abeb839c36b5238ec115329ce05b58e3383a55..853056ad5c5eeff03e7d6fe0dfd6f837a03ad882 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -632,6 +632,15 @@ public class ServerChunkCache extends ChunkSource { diff --git a/patches/server/0175-PreCreatureSpawnEvent.patch b/patches/server/0174-PreCreatureSpawnEvent.patch similarity index 100% rename from patches/server/0175-PreCreatureSpawnEvent.patch rename to patches/server/0174-PreCreatureSpawnEvent.patch diff --git a/patches/server/0176-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0175-Add-setPlayerProfile-API-for-Skulls.patch similarity index 100% rename from patches/server/0176-Add-setPlayerProfile-API-for-Skulls.patch rename to patches/server/0175-Add-setPlayerProfile-API-for-Skulls.patch diff --git a/patches/server/0177-Fill-Profile-Property-Events.patch b/patches/server/0176-Fill-Profile-Property-Events.patch similarity index 100% rename from patches/server/0177-Fill-Profile-Property-Events.patch rename to patches/server/0176-Fill-Profile-Property-Events.patch diff --git a/patches/server/0178-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0177-PlayerAdvancementCriterionGrantEvent.patch similarity index 100% rename from patches/server/0178-PlayerAdvancementCriterionGrantEvent.patch rename to patches/server/0177-PlayerAdvancementCriterionGrantEvent.patch diff --git a/patches/server/0179-Add-ArmorStand-Item-Meta.patch b/patches/server/0178-Add-ArmorStand-Item-Meta.patch similarity index 100% rename from patches/server/0179-Add-ArmorStand-Item-Meta.patch rename to patches/server/0178-Add-ArmorStand-Item-Meta.patch diff --git a/patches/server/0180-Extend-Player-Interact-cancellation.patch b/patches/server/0179-Extend-Player-Interact-cancellation.patch similarity index 100% rename from patches/server/0180-Extend-Player-Interact-cancellation.patch rename to patches/server/0179-Extend-Player-Interact-cancellation.patch diff --git a/patches/server/0181-Tameable-getOwnerUniqueId-API.patch b/patches/server/0180-Tameable-getOwnerUniqueId-API.patch similarity index 100% rename from patches/server/0181-Tameable-getOwnerUniqueId-API.patch rename to patches/server/0180-Tameable-getOwnerUniqueId-API.patch diff --git a/patches/server/0182-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/server/0181-Toggleable-player-crits-helps-mitigate-hacked-client.patch similarity index 100% rename from patches/server/0182-Toggleable-player-crits-helps-mitigate-hacked-client.patch rename to patches/server/0181-Toggleable-player-crits-helps-mitigate-hacked-client.patch diff --git a/patches/server/0183-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0182-Disable-Explicit-Network-Manager-Flushing.patch similarity index 100% rename from patches/server/0183-Disable-Explicit-Network-Manager-Flushing.patch rename to patches/server/0182-Disable-Explicit-Network-Manager-Flushing.patch diff --git a/patches/server/0184-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0183-Implement-extended-PaperServerListPingEvent.patch similarity index 99% rename from patches/server/0184-Implement-extended-PaperServerListPingEvent.patch rename to patches/server/0183-Implement-extended-PaperServerListPingEvent.patch index ff5a86f8c..db5951c82 100644 --- a/patches/server/0184-Implement-extended-PaperServerListPingEvent.patch +++ b/patches/server/0183-Implement-extended-PaperServerListPingEvent.patch @@ -190,7 +190,7 @@ index 67455a5ba75c9b816213e44d6872c5ddf8e27e98..23efad80934930beadf15e65781551d4 public ClientboundStatusResponsePacket(ServerStatus metadata) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d86c5cb6fa9c31db90c6392cd8baf5823b6c32b4..050b27be1c25764d65e5340149718e858b3aeb2e 100644 +index 151d08104ed390905becda5f7ba16c8f933cd3d0..80f8e994d4a85f5d240854ec492adba0633263b2 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2,6 +2,9 @@ package net.minecraft.server; diff --git a/patches/server/0185-Improved-Async-Task-Scheduler.patch b/patches/server/0184-Improved-Async-Task-Scheduler.patch similarity index 100% rename from patches/server/0185-Improved-Async-Task-Scheduler.patch rename to patches/server/0184-Improved-Async-Task-Scheduler.patch diff --git a/patches/server/0186-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/server/0185-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch similarity index 100% rename from patches/server/0186-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to patches/server/0185-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch diff --git a/patches/server/0187-Player.setPlayerProfile-API.patch b/patches/server/0186-Player.setPlayerProfile-API.patch similarity index 98% rename from patches/server/0187-Player.setPlayerProfile-API.patch rename to patches/server/0186-Player.setPlayerProfile-API.patch index 94781084f..ff7d35e9b 100644 --- a/patches/server/0187-Player.setPlayerProfile-API.patch +++ b/patches/server/0186-Player.setPlayerProfile-API.patch @@ -39,7 +39,7 @@ index 278416af649425890ad00ca6f47d459ebab08e0b..91f96f5718f7a7f2e0ce56f4dbf894d8 private ItemStack lastItemInMainHand; private final ItemCooldowns cooldowns; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 44533533c4860a23a0d469c6a544825297d221de..be339681a63db12222a2e5727399f088c053fa4f 100644 +index f1c56823e1e89251c518d9d51ab7442b30a85336..8f7807409a21369bad1515af9c1ebac778924aec 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -71,6 +71,7 @@ import net.minecraft.world.item.enchantment.EnchantmentHelper; diff --git a/patches/server/0188-getPlayerUniqueId-API.patch b/patches/server/0187-getPlayerUniqueId-API.patch similarity index 100% rename from patches/server/0188-getPlayerUniqueId-API.patch rename to patches/server/0187-getPlayerUniqueId-API.patch diff --git a/patches/server/0189-Make-player-data-saving-configurable.patch b/patches/server/0188-Make-player-data-saving-configurable.patch similarity index 100% rename from patches/server/0189-Make-player-data-saving-configurable.patch rename to patches/server/0188-Make-player-data-saving-configurable.patch diff --git a/patches/server/0190-Make-legacy-ping-handler-more-reliable.patch b/patches/server/0189-Make-legacy-ping-handler-more-reliable.patch similarity index 100% rename from patches/server/0190-Make-legacy-ping-handler-more-reliable.patch rename to patches/server/0189-Make-legacy-ping-handler-more-reliable.patch diff --git a/patches/server/0191-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/0190-Call-PaperServerListPingEvent-for-legacy-pings.patch similarity index 100% rename from patches/server/0191-Call-PaperServerListPingEvent-for-legacy-pings.patch rename to patches/server/0190-Call-PaperServerListPingEvent-for-legacy-pings.patch diff --git a/patches/server/0192-Flag-to-disable-the-channel-limit.patch b/patches/server/0191-Flag-to-disable-the-channel-limit.patch similarity index 95% rename from patches/server/0192-Flag-to-disable-the-channel-limit.patch rename to patches/server/0191-Flag-to-disable-the-channel-limit.patch index 827ad8fd0..7387544ac 100644 --- a/patches/server/0192-Flag-to-disable-the-channel-limit.patch +++ b/patches/server/0191-Flag-to-disable-the-channel-limit.patch @@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs. provide an optional flag to disable this check, at your own risk. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index be339681a63db12222a2e5727399f088c053fa4f..8c41ec25ed14ae2541ae3412fb1f4c11e641a32c 100644 +index 8f7807409a21369bad1515af9c1ebac778924aec..60b8d4f974952c131c94c0dd23e44e28135beff9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -149,6 +149,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0193-Add-method-to-open-already-placed-sign.patch b/patches/server/0192-Add-method-to-open-already-placed-sign.patch similarity index 100% rename from patches/server/0193-Add-method-to-open-already-placed-sign.patch rename to patches/server/0192-Add-method-to-open-already-placed-sign.patch diff --git a/patches/server/0194-Configurable-sprint-interruption-on-attack.patch b/patches/server/0193-Configurable-sprint-interruption-on-attack.patch similarity index 100% rename from patches/server/0194-Configurable-sprint-interruption-on-attack.patch rename to patches/server/0193-Configurable-sprint-interruption-on-attack.patch diff --git a/patches/server/0195-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch similarity index 93% rename from patches/server/0195-Fix-exploit-that-allowed-colored-signs-to-be-created.patch rename to patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch index 28a322773..55fe4772d 100644 --- a/patches/server/0195-Fix-exploit-that-allowed-colored-signs-to-be-created.patch +++ b/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix exploit that allowed colored signs to be created diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 413bf8504821d4605e940f865332e8dd77acb436..3bc5749f0e93b0298fa9a170e53f11dd05730eb1 100644 +index 92f6f51d3642e1e8bcdb400da87f96ecf20c3218..52e51fe26c4c69842ac9d51e747cb10a7aab289f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2787,9 +2787,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0196-EndermanEscapeEvent.patch b/patches/server/0195-EndermanEscapeEvent.patch similarity index 100% rename from patches/server/0196-EndermanEscapeEvent.patch rename to patches/server/0195-EndermanEscapeEvent.patch diff --git a/patches/server/0197-Enderman.teleportRandomly.patch b/patches/server/0196-Enderman.teleportRandomly.patch similarity index 100% rename from patches/server/0197-Enderman.teleportRandomly.patch rename to patches/server/0196-Enderman.teleportRandomly.patch diff --git a/patches/server/0198-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0197-Block-Enderpearl-Travel-Exploit.patch similarity index 100% rename from patches/server/0198-Block-Enderpearl-Travel-Exploit.patch rename to patches/server/0197-Block-Enderpearl-Travel-Exploit.patch diff --git a/patches/server/0199-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0198-Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 97% rename from patches/server/0199-Expand-World.spawnParticle-API-and-add-Builder.patch rename to patches/server/0198-Expand-World.spawnParticle-API-and-add-Builder.patch index 943ad3133..41046d1ba 100644 --- a/patches/server/0199-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/patches/server/0198-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle. This adds a new Builder API which is much friendlier to use. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 33b156a02b1b051b0cafb55af2804b1f3f4b4434..c29092954b0ea79184972d266d22570b343a9d70 100644 +index 960471d86a599ca20aaede2e0ae07f7428b7ec4f..894e828280d6ccc175cffd8813602b3406c8e95a 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1287,12 +1287,17 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl diff --git a/patches/server/0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/server/0199-Prevent-Frosted-Ice-from-loading-holding-chunks.patch similarity index 100% rename from patches/server/0200-Prevent-Frosted-Ice-from-loading-holding-chunks.patch rename to patches/server/0199-Prevent-Frosted-Ice-from-loading-holding-chunks.patch diff --git a/patches/server/0201-EndermanAttackPlayerEvent.patch b/patches/server/0200-EndermanAttackPlayerEvent.patch similarity index 100% rename from patches/server/0201-EndermanAttackPlayerEvent.patch rename to patches/server/0200-EndermanAttackPlayerEvent.patch diff --git a/patches/server/0202-WitchConsumePotionEvent.patch b/patches/server/0201-WitchConsumePotionEvent.patch similarity index 100% rename from patches/server/0202-WitchConsumePotionEvent.patch rename to patches/server/0201-WitchConsumePotionEvent.patch diff --git a/patches/server/0203-WitchThrowPotionEvent.patch b/patches/server/0202-WitchThrowPotionEvent.patch similarity index 100% rename from patches/server/0203-WitchThrowPotionEvent.patch rename to patches/server/0202-WitchThrowPotionEvent.patch diff --git a/patches/server/0204-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/server/0203-Allow-spawning-Item-entities-with-World.spawnEntity.patch similarity index 100% rename from patches/server/0204-Allow-spawning-Item-entities-with-World.spawnEntity.patch rename to patches/server/0203-Allow-spawning-Item-entities-with-World.spawnEntity.patch diff --git a/patches/server/0205-WitchReadyPotionEvent.patch b/patches/server/0204-WitchReadyPotionEvent.patch similarity index 100% rename from patches/server/0205-WitchReadyPotionEvent.patch rename to patches/server/0204-WitchReadyPotionEvent.patch diff --git a/patches/server/0206-ItemStack-getMaxItemUseDuration.patch b/patches/server/0205-ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from patches/server/0206-ItemStack-getMaxItemUseDuration.patch rename to patches/server/0205-ItemStack-getMaxItemUseDuration.patch diff --git a/patches/server/0207-Implement-EntityTeleportEndGatewayEvent.patch b/patches/server/0206-Implement-EntityTeleportEndGatewayEvent.patch similarity index 100% rename from patches/server/0207-Implement-EntityTeleportEndGatewayEvent.patch rename to patches/server/0206-Implement-EntityTeleportEndGatewayEvent.patch diff --git a/patches/server/0208-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0207-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch similarity index 100% rename from patches/server/0208-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch rename to patches/server/0207-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch diff --git a/patches/server/0209-Fix-CraftEntity-hashCode.patch b/patches/server/0208-Fix-CraftEntity-hashCode.patch similarity index 100% rename from patches/server/0209-Fix-CraftEntity-hashCode.patch rename to patches/server/0208-Fix-CraftEntity-hashCode.patch diff --git a/patches/server/0210-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/server/0209-Configurable-Alternative-LootPool-Luck-Formula.patch similarity index 100% rename from patches/server/0210-Configurable-Alternative-LootPool-Luck-Formula.patch rename to patches/server/0209-Configurable-Alternative-LootPool-Luck-Formula.patch diff --git a/patches/server/0211-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0210-Print-Error-details-when-failing-to-save-player-data.patch similarity index 100% rename from patches/server/0211-Print-Error-details-when-failing-to-save-player-data.patch rename to patches/server/0210-Print-Error-details-when-failing-to-save-player-data.patch diff --git a/patches/server/0212-Make-shield-blocking-delay-configurable.patch b/patches/server/0211-Make-shield-blocking-delay-configurable.patch similarity index 100% rename from patches/server/0212-Make-shield-blocking-delay-configurable.patch rename to patches/server/0211-Make-shield-blocking-delay-configurable.patch diff --git a/patches/server/0213-Improve-EntityShootBowEvent.patch b/patches/server/0212-Improve-EntityShootBowEvent.patch similarity index 100% rename from patches/server/0213-Improve-EntityShootBowEvent.patch rename to patches/server/0212-Improve-EntityShootBowEvent.patch diff --git a/patches/server/0214-PlayerReadyArrowEvent.patch b/patches/server/0213-PlayerReadyArrowEvent.patch similarity index 100% rename from patches/server/0214-PlayerReadyArrowEvent.patch rename to patches/server/0213-PlayerReadyArrowEvent.patch diff --git a/patches/server/0215-Implement-EntityKnockbackByEntityEvent.patch b/patches/server/0214-Implement-EntityKnockbackByEntityEvent.patch similarity index 98% rename from patches/server/0215-Implement-EntityKnockbackByEntityEvent.patch rename to patches/server/0214-Implement-EntityKnockbackByEntityEvent.patch index fde58e368..50cd53aa9 100644 --- a/patches/server/0215-Implement-EntityKnockbackByEntityEvent.patch +++ b/patches/server/0214-Implement-EntityKnockbackByEntityEvent.patch @@ -56,7 +56,7 @@ index 08c29388621bf460e1704f6edba59d08a12e75d0..7bb2ce6b378547d593f8487626b5a4d4 } diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 61c9b89b6ef41cde465d84f75f2dc6ef07048cc4..9c208d24d6f84e8818c0a7b88cdcb7c2fd703f91 100644 +index 85633cd1718783cffe03f750da1c17270eeb4cdd..5595150b0da580fce4d5d23993d77314e225ad58 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -1532,7 +1532,7 @@ public abstract class Mob extends LivingEntity { diff --git a/patches/server/0216-Expand-Explosions-API.patch b/patches/server/0215-Expand-Explosions-API.patch similarity index 100% rename from patches/server/0216-Expand-Explosions-API.patch rename to patches/server/0215-Expand-Explosions-API.patch diff --git a/patches/server/0217-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/0216-LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 100% rename from patches/server/0217-LivingEntity-Hand-Raised-Item-Use-API.patch rename to patches/server/0216-LivingEntity-Hand-Raised-Item-Use-API.patch diff --git a/patches/server/0218-RangedEntity-API.patch b/patches/server/0217-RangedEntity-API.patch similarity index 100% rename from patches/server/0218-RangedEntity-API.patch rename to patches/server/0217-RangedEntity-API.patch diff --git a/patches/server/0219-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0218-Add-config-to-disable-ender-dragon-legacy-check.patch similarity index 100% rename from patches/server/0219-Add-config-to-disable-ender-dragon-legacy-check.patch rename to patches/server/0218-Add-config-to-disable-ender-dragon-legacy-check.patch diff --git a/patches/server/0220-Implement-World.getEntity-UUID-API.patch b/patches/server/0219-Implement-World.getEntity-UUID-API.patch similarity index 100% rename from patches/server/0220-Implement-World.getEntity-UUID-API.patch rename to patches/server/0219-Implement-World.getEntity-UUID-API.patch diff --git a/patches/server/0221-InventoryCloseEvent-Reason-API.patch b/patches/server/0220-InventoryCloseEvent-Reason-API.patch similarity index 97% rename from patches/server/0221-InventoryCloseEvent-Reason-API.patch rename to patches/server/0220-InventoryCloseEvent-Reason-API.patch index b72795a64..6d1f46d9b 100644 --- a/patches/server/0221-InventoryCloseEvent-Reason-API.patch +++ b/patches/server/0220-InventoryCloseEvent-Reason-API.patch @@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers to "confirm" things based on if it was player triggered close or not. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index c29092954b0ea79184972d266d22570b343a9d70..ab5059b5cdbcb8e4d47d21d2883c0cd52fc00cf7 100644 +index 894e828280d6ccc175cffd8813602b3406c8e95a..0f45f6022a4dc9638032278cce0f8d6fc431bd56 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1055,7 +1055,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl @@ -84,7 +84,7 @@ index 83a2c8e00d8445ad66bb8360f4e0e4b7cba44bb3..b9fdccfc9815b0aec7bb5f5ad633c69b this.doCloseContainer(); } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3bc5749f0e93b0298fa9a170e53f11dd05730eb1..f9f1eb0d7e85278186f42a4975d113bf07f367e9 100644 +index 52e51fe26c4c69842ac9d51e747cb10a7aab289f..832233eea019b9a10b182ef1a2a072ece4b88ee4 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -188,6 +188,7 @@ import org.bukkit.event.inventory.ClickType; @@ -185,7 +185,7 @@ index c839ea0b68fbdccfb7ed667c705a3f0f347fd89c..43cee8b0b2b94d6db6303a1631731ed5 @Override public boolean isBlocking() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 8c41ec25ed14ae2541ae3412fb1f4c11e641a32c..b810ea97165d4a5e1f93cc6ca64c9bdbce740313 100644 +index 60b8d4f974952c131c94c0dd23e44e28135beff9..1800119160d5711b694c14e9dde175b11c06ce61 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -921,7 +921,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0222-Vex-get-setSummoner-API.patch b/patches/server/0221-Vex-get-setSummoner-API.patch similarity index 100% rename from patches/server/0222-Vex-get-setSummoner-API.patch rename to patches/server/0221-Vex-get-setSummoner-API.patch diff --git a/patches/server/0223-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0222-Refresh-player-inventory-when-cancelling-PlayerInter.patch similarity index 94% rename from patches/server/0223-Refresh-player-inventory-when-cancelling-PlayerInter.patch rename to patches/server/0222-Refresh-player-inventory-when-cancelling-PlayerInter.patch index ab138c34e..6c17e108c 100644 --- a/patches/server/0223-Refresh-player-inventory-when-cancelling-PlayerInter.patch +++ b/patches/server/0222-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 f9f1eb0d7e85278186f42a4975d113bf07f367e9..4526bf94a9fd39c2f139666557f389a8684595a2 100644 +index 832233eea019b9a10b182ef1a2a072ece4b88ee4..f8787bda0652affef90300e334200c34db6b1675 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2218,6 +2218,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0224-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/patches/server/0223-Avoid-item-merge-if-stack-size-above-max-stack-size.patch similarity index 100% rename from patches/server/0224-Avoid-item-merge-if-stack-size-above-max-stack-size.patch rename to patches/server/0223-Avoid-item-merge-if-stack-size-above-max-stack-size.patch diff --git a/patches/server/0225-Use-asynchronous-Log4j-2-loggers.patch b/patches/server/0224-Use-asynchronous-Log4j-2-loggers.patch similarity index 95% rename from patches/server/0225-Use-asynchronous-Log4j-2-loggers.patch rename to patches/server/0224-Use-asynchronous-Log4j-2-loggers.patch index 848d77d52..fbd87dbd6 100644 --- a/patches/server/0225-Use-asynchronous-Log4j-2-loggers.patch +++ b/patches/server/0224-Use-asynchronous-Log4j-2-loggers.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use asynchronous Log4j 2 loggers diff --git a/build.gradle.kts b/build.gradle.kts -index 2946f2bd0b12846929c8d708cabe019c2bbf2297..bac1ed67b41fd0f63a1e4f511d62144791360550 100644 +index 55915452beff1f8b6b9a44cf2a6d208dda6c3d8d..ff26c51fe2a04bd8a18a9c4ee9ca004f32fae4ab 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -42,6 +42,7 @@ dependencies { diff --git a/patches/server/0226-add-more-information-to-Entity.toString.patch b/patches/server/0225-add-more-information-to-Entity.toString.patch similarity index 93% rename from patches/server/0226-add-more-information-to-Entity.toString.patch rename to patches/server/0225-add-more-information-to-Entity.toString.patch index 544410208..899bad1dc 100644 --- a/patches/server/0226-add-more-information-to-Entity.toString.patch +++ b/patches/server/0225-add-more-information-to-Entity.toString.patch @@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString() UUID, ticks lived, valid, dead diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 609bffc7d8f21c8733b3fb861fe02f9d1302d796..fc12ee50c275705b7ca33f7f1f2578d0857b47f0 100644 +index f3b5df4e693d923796929b79f9a43bfa4cbe03e7..a6ba0c7fe05aae72b98072aaa008a1346bf2704e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2805,7 +2805,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0227-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/patches/server/0226-Add-CraftMagicNumbers.isSupportedApiVersion.patch similarity index 100% rename from patches/server/0227-Add-CraftMagicNumbers.isSupportedApiVersion.patch rename to patches/server/0226-Add-CraftMagicNumbers.isSupportedApiVersion.patch diff --git a/patches/server/0228-EnderDragon-Events.patch b/patches/server/0227-EnderDragon-Events.patch similarity index 100% rename from patches/server/0228-EnderDragon-Events.patch rename to patches/server/0227-EnderDragon-Events.patch diff --git a/patches/server/0229-PlayerElytraBoostEvent.patch b/patches/server/0228-PlayerElytraBoostEvent.patch similarity index 100% rename from patches/server/0229-PlayerElytraBoostEvent.patch rename to patches/server/0228-PlayerElytraBoostEvent.patch diff --git a/patches/server/0230-PlayerLaunchProjectileEvent.patch b/patches/server/0229-PlayerLaunchProjectileEvent.patch similarity index 100% rename from patches/server/0230-PlayerLaunchProjectileEvent.patch rename to patches/server/0229-PlayerLaunchProjectileEvent.patch diff --git a/patches/server/0231-Improve-BlockPosition-inlining.patch b/patches/server/0230-Improve-BlockPosition-inlining.patch similarity index 100% rename from patches/server/0231-Improve-BlockPosition-inlining.patch rename to patches/server/0230-Improve-BlockPosition-inlining.patch diff --git a/patches/server/0232-Optimize-IntIdentityHashBiMiap-nextId.patch b/patches/server/0231-Optimize-IntIdentityHashBiMiap-nextId.patch similarity index 100% rename from patches/server/0232-Optimize-IntIdentityHashBiMiap-nextId.patch rename to patches/server/0231-Optimize-IntIdentityHashBiMiap-nextId.patch diff --git a/patches/server/0233-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0232-Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 96% rename from patches/server/0233-Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to patches/server/0232-Option-to-prevent-armor-stands-from-doing-entity-loo.patch index b1bacc83c..801e72066 100644 --- a/patches/server/0233-Option-to-prevent-armor-stands-from-doing-entity-loo.patch +++ b/patches/server/0232-Option-to-prevent-armor-stands-from-doing-entity-loo.patch @@ -31,7 +31,7 @@ index 6d717d3852afb3a3a4bef30c68980c402bdfefff..b47b1215e685c453c3496439bb350a91 for (int i = 0; i < list.size(); ++i) { diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index e9e694286bce719b825a37939fe8ab90a5010819..ed7b9b350558df96f91b64ceccb137968c05a0f6 100644 +index 4e7644f875b8ed10cb402e5e1c8b71b4842e0e40..2d13cbfb5e4ea359106fc008f203b104a179b9c0 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -769,6 +769,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0234-Vanished-players-don-t-have-rights.patch b/patches/server/0233-Vanished-players-don-t-have-rights.patch similarity index 98% rename from patches/server/0234-Vanished-players-don-t-have-rights.patch rename to patches/server/0233-Vanished-players-don-t-have-rights.patch index 9ab65f793..0d00e2dc4 100644 --- a/patches/server/0234-Vanished-players-don-t-have-rights.patch +++ b/patches/server/0233-Vanished-players-don-t-have-rights.patch @@ -38,7 +38,7 @@ index 86d245c9a817be5fd2be7f331d3a3a5f3169e8c2..44b28773fe8e79931e738d493bd9405e BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(context.getLevel(), context.getClickedPos()), player, CraftBlockData.fromData(state), defaultReturn); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index ed7b9b350558df96f91b64ceccb137968c05a0f6..4635400065ef169d7c95e083c2b57eb0dd7f29ce 100644 +index 2d13cbfb5e4ea359106fc008f203b104a179b9c0..f820232e037fa05f7d666fddac6ad1b8b18b04e0 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -71,6 +71,10 @@ import net.minecraft.world.level.saveddata.maps.MapItemSavedData; diff --git a/patches/server/0235-Allow-disabling-armour-stand-ticking.patch b/patches/server/0234-Allow-disabling-armour-stand-ticking.patch similarity index 100% rename from patches/server/0235-Allow-disabling-armour-stand-ticking.patch rename to patches/server/0234-Allow-disabling-armour-stand-ticking.patch diff --git a/patches/server/0236-SkeletonHorse-Additions.patch b/patches/server/0235-SkeletonHorse-Additions.patch similarity index 100% rename from patches/server/0236-SkeletonHorse-Additions.patch rename to patches/server/0235-SkeletonHorse-Additions.patch diff --git a/patches/server/0237-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0236-Don-t-call-getItemMeta-on-hasItemMeta.patch similarity index 100% rename from patches/server/0237-Don-t-call-getItemMeta-on-hasItemMeta.patch rename to patches/server/0236-Don-t-call-getItemMeta-on-hasItemMeta.patch diff --git a/patches/server/0238-Implement-Expanded-ArmorStand-API.patch b/patches/server/0237-Implement-Expanded-ArmorStand-API.patch similarity index 100% rename from patches/server/0238-Implement-Expanded-ArmorStand-API.patch rename to patches/server/0237-Implement-Expanded-ArmorStand-API.patch diff --git a/patches/server/0239-AnvilDamageEvent.patch b/patches/server/0238-AnvilDamageEvent.patch similarity index 100% rename from patches/server/0239-AnvilDamageEvent.patch rename to patches/server/0238-AnvilDamageEvent.patch diff --git a/patches/server/0240-Add-hand-to-bucket-events.patch b/patches/server/0239-Add-hand-to-bucket-events.patch similarity index 98% rename from patches/server/0240-Add-hand-to-bucket-events.patch rename to patches/server/0239-Add-hand-to-bucket-events.patch index 505743be9..6c2a14e07 100644 --- a/patches/server/0240-Add-hand-to-bucket-events.patch +++ b/patches/server/0239-Add-hand-to-bucket-events.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add hand to bucket events diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index ab5059b5cdbcb8e4d47d21d2883c0cd52fc00cf7..b9468cc49573cee3c64f0be955fa6ec2cc10c58c 100644 +index 0f45f6022a4dc9638032278cce0f8d6fc431bd56..4df153a3b2cc4b6be499107a997a054abe3569d8 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1419,15 +1419,17 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl @@ -117,7 +117,7 @@ index 24272b384b96bb98a8231fe8583f404ad0c96de5..7c3e94c6bf8337ef660473d8ed451606 int i = blockposition.getX(); int j = blockposition.getY(); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 4635400065ef169d7c95e083c2b57eb0dd7f29ce..53ea0231737e162a8914d916bfd3ab8fe244208f 100644 +index f820232e037fa05f7d666fddac6ad1b8b18b04e0..f354fe35c7fb4b869c9229b14a2cb6b00c7f0973 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -291,6 +291,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0241-Add-TNTPrimeEvent.patch b/patches/server/0240-Add-TNTPrimeEvent.patch similarity index 100% rename from patches/server/0241-Add-TNTPrimeEvent.patch rename to patches/server/0240-Add-TNTPrimeEvent.patch diff --git a/patches/server/0242-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0241-Break-up-and-make-tab-spam-limits-configurable.patch similarity index 98% rename from patches/server/0242-Break-up-and-make-tab-spam-limits-configurable.patch rename to patches/server/0241-Break-up-and-make-tab-spam-limits-configurable.patch index aa9667bc2..34c79ced0 100644 --- a/patches/server/0242-Break-up-and-make-tab-spam-limits-configurable.patch +++ b/patches/server/0241-Break-up-and-make-tab-spam-limits-configurable.patch @@ -45,7 +45,7 @@ index 77a03abd59db4a43f6f2d59d4c7ef176e782f205..bd508025b771424c942fd856c31d520b + } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 4526bf94a9fd39c2f139666557f389a8684595a2..1c76d6a616d6967402fb55feffafffa0aa2fd468 100644 +index f8787bda0652affef90300e334200c34db6b1675..eb52ca159e895608a6a662821f14910970759dd2 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -228,6 +228,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0243-MC-135506-Experience-should-save-as-Integers.patch b/patches/server/0242-MC-135506-Experience-should-save-as-Integers.patch similarity index 93% rename from patches/server/0243-MC-135506-Experience-should-save-as-Integers.patch rename to patches/server/0242-MC-135506-Experience-should-save-as-Integers.patch index e0997fb33..eb97aede6 100644 --- a/patches/server/0243-MC-135506-Experience-should-save-as-Integers.patch +++ b/patches/server/0242-MC-135506-Experience-should-save-as-Integers.patch @@ -5,7 +5,7 @@ Subject: [PATCH] MC-135506: Experience should save as Integers diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java -index 30a3facc1b23ccb508b30c5affa9ea1c527dd48b..a30f9d57257e1de1641f4af1fa7afaea3f0fd37c 100644 +index 628407ad2f8fd01850dd4f9e25799bcd6a93961d..1947905e1e7e0208ad79f521cae8973c31c4eac1 100644 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java @@ -283,7 +283,7 @@ public class ExperienceOrb extends Entity { diff --git a/patches/server/0244-Fix-client-rendering-skulls-from-same-user.patch b/patches/server/0243-Fix-client-rendering-skulls-from-same-user.patch similarity index 100% rename from patches/server/0244-Fix-client-rendering-skulls-from-same-user.patch rename to patches/server/0243-Fix-client-rendering-skulls-from-same-user.patch diff --git a/patches/server/0245-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch similarity index 95% rename from patches/server/0245-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch rename to patches/server/0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch index b321f9165..9e3b69e6e 100644 --- a/patches/server/0245-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch +++ b/patches/server/0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch @@ -8,7 +8,7 @@ Add -Ddebug.entities=true to your JVM flags to gain more information 1.17: Needs to be reworked for new entity storage system diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index dd9cae17aa9ec02e25642a1a45409bec7fb1da91..52bcfcc7443b57b0e57024c0c4e78c5a7260410d 100644 +index 94c5577a887ab4801dae5a1a0accd4b2f448bcc2..b794922eeccc845632f2442a3ed923f1d826a9e1 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1156,6 +1156,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -29,7 +29,7 @@ index dd9cae17aa9ec02e25642a1a45409bec7fb1da91..52bcfcc7443b57b0e57024c0c4e78c5a protected void tick() { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index b9468cc49573cee3c64f0be955fa6ec2cc10c58c..e299bf10c0bdd14398d590939d90cc723ecd4ce5 100644 +index 4df153a3b2cc4b6be499107a997a054abe3569d8..774f37e02feb83be3b92620aa4a0227a0c4acc93 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -202,6 +202,9 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl @@ -72,7 +72,7 @@ index b9468cc49573cee3c64f0be955fa6ec2cc10c58c..e299bf10c0bdd14398d590939d90cc72 return false; } else { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index fc12ee50c275705b7ca33f7f1f2578d0857b47f0..4c769a68c5c234b33d72d9ca17f8d1fef5d23478 100644 +index a6ba0c7fe05aae72b98072aaa008a1346bf2704e..2138db2c7dc750cc9c2eb49b7878e4f172fb97e5 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -171,6 +171,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -85,7 +85,7 @@ index fc12ee50c275705b7ca33f7f1f2578d0857b47f0..4c769a68c5c234b33d72d9ca17f8d1fe if (this.bukkitEntity == null) { this.bukkitEntity = CraftEntity.getEntity(this.level.getCraftServer(), this); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 53ea0231737e162a8914d916bfd3ab8fe244208f..d550ed7358aa8561bf307972d411f170bd96d515 100644 +index f354fe35c7fb4b869c9229b14a2cb6b00c7f0973..7bcb67df44a231d9b598a57c1b10bec18823bf74 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -141,6 +141,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0246-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0245-Add-Early-Warning-Feature-to-WatchDog.patch similarity index 99% rename from patches/server/0246-Add-Early-Warning-Feature-to-WatchDog.patch rename to patches/server/0245-Add-Early-Warning-Feature-to-WatchDog.patch index 4b271ce3d..67657e848 100644 --- a/patches/server/0246-Add-Early-Warning-Feature-to-WatchDog.patch +++ b/patches/server/0245-Add-Early-Warning-Feature-to-WatchDog.patch @@ -36,7 +36,7 @@ index bd508025b771424c942fd856c31d520b6f548082..62621562137cba4804f0465c58d25ca2 public static int tabSpamLimit = 500; private static void tabSpamLimiters() { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 050b27be1c25764d65e5340149718e858b3aeb2e..880fc4e346549a5d7ed627244bdfd284705ad2fc 100644 +index 80f8e994d4a85f5d240854ec492adba0633263b2..537efec03939b0f5640dfd974bb0bd68e93b4325 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1076,6 +1076,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop> getFutureIfPresentUnchecked(ChunkStatus leastStatus) { diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index e6090343eda328ab612a9345978cf8da353e9566..c687f6b2b97fc32bd01add75d6327f0debbfb290 100644 +index 2c2f0497e34c58c358b04e72c9d27ef1eead4a42..39bf531bce103161cbd836d3a1eb882627cd89a6 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -84,6 +84,7 @@ import net.minecraft.world.level.chunk.ProtoChunk; @@ -108,7 +108,7 @@ index e6090343eda328ab612a9345978cf8da353e9566..c687f6b2b97fc32bd01add75d6327f0d // Spigot start return this.isOutsideOfRange(chunkPos, false); diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index d76568b06ff5035e59b664e371fe4a216517327a..6f8b4d9974c8fb549d69e9b46ab05958c9ce0ba7 100644 +index 672f78d1560ccd45d1a0ca04d6daf8188105c3e9..734b204d53a4b9e9b1112efe3a50b53cf1aa9f47 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -324,6 +324,7 @@ public class ServerChunkCache extends ChunkSource { diff --git a/patches/server/0338-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0337-Show-blockstate-location-if-we-failed-to-read-it.patch similarity index 100% rename from patches/server/0338-Show-blockstate-location-if-we-failed-to-read-it.patch rename to patches/server/0337-Show-blockstate-location-if-we-failed-to-read-it.patch diff --git a/patches/server/0339-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0338-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch similarity index 100% rename from patches/server/0339-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch rename to patches/server/0338-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch diff --git a/patches/server/0340-Configurable-projectile-relative-velocity.patch b/patches/server/0339-Configurable-projectile-relative-velocity.patch similarity index 100% rename from patches/server/0340-Configurable-projectile-relative-velocity.patch rename to patches/server/0339-Configurable-projectile-relative-velocity.patch diff --git a/patches/server/0341-offset-item-frame-ticking.patch b/patches/server/0340-offset-item-frame-ticking.patch similarity index 100% rename from patches/server/0341-offset-item-frame-ticking.patch rename to patches/server/0340-offset-item-frame-ticking.patch diff --git a/patches/server/0342-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/patches/server/0341-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch similarity index 96% rename from patches/server/0342-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch rename to patches/server/0341-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch index eb3a0b6db..4a48360f2 100644 --- a/patches/server/0342-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch +++ b/patches/server/0341-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch @@ -7,7 +7,7 @@ If the Bukkit generator already has a spawn, use it immediately instead of spending time generating one that we won't use diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 40e48c3f1199b127066732e3c8a6d40c232215b2..f00839eab02277bf10b742c88fadc4aa9e89e7e0 100644 +index 29c1b3a43dd369419e8c93b571679a2ba024e4f6..38b92db7591c060a45c4bf8bb7e4a25bb649a742 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -678,12 +678,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop, ChunkHolder.ChunkLoadingFailure>> completablefuture = this.getChunkRangeFuture(chunkcoordintpair, 1, (i) -> { diff --git a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java -index 390d841d34bb0ef67fe5b82199fbe268277a5f44..58de276b1ba709d466ca8e6bde42be4f3bdcf26c 100644 +index ed26c290dfbf11735728716577ff564ba84437f0..624fd443d2cc71605cfff996140b00f37c8d8841 100644 --- a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java +++ b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java @@ -61,7 +61,21 @@ public class PersistentEntitySectionManager implements A diff --git a/patches/server/0354-Optimize-Hoppers.patch b/patches/server/0353-Optimize-Hoppers.patch similarity index 99% rename from patches/server/0354-Optimize-Hoppers.patch rename to patches/server/0353-Optimize-Hoppers.patch index 0a9295daa..6e2dc8828 100644 --- a/patches/server/0354-Optimize-Hoppers.patch +++ b/patches/server/0353-Optimize-Hoppers.patch @@ -32,7 +32,7 @@ index 9860f5a0ddff83f1393ee13a96b38c3b14077512..bf704993d0abd50dba91682a7fbb575e } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f00839eab02277bf10b742c88fadc4aa9e89e7e0..312be2221e1acc44aaf6936533b0eb968f796dc6 100644 +index 38b92db7591c060a45c4bf8bb7e4a25bb649a742..670b4687c660526f806dd5e8214af1113912199b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1422,6 +1422,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop> getOrScheduleFuture(ChunkStatus targetStatus, ChunkMap chunkStorage) { diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index d2328099e5bd807ac63139c89f3aa230fd7a5f7e..f820931435d7e17261f9b7c37be036111e7156ef 100644 +index c8cc8fa2d210acf82d9c3fa96c0b0c3912dec4d8..6f4c350f486aa70b94be8cf5a7b0e22599283ba9 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -127,7 +127,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -520,7 +520,7 @@ index 45c7ebe67019cdbe88b6617a95d5c40d3a68286c..38eebda226e007c8910e04f502ce218c if (withinViewDistance) { DistanceManager.this.ticketThrottlerInput.tell(ChunkTaskPriorityQueueSorter.message(() -> { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 54cc0391f77d90a206e9fb2422ea31d5b9ee22af..648e7b258eef32213c512781faffa840eedebec6 100644 +index 7ce027a7352d2ab34c27046d86ae32100c0baeb4..6ecf85579acb186f076f258368051a4ae09c3354 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -241,6 +241,7 @@ public class ServerPlayer extends Player { @@ -563,7 +563,7 @@ index bcc946d2747443c34ee8ac2485a5ab41773c93af..2730923bd0bf3b0f928765b9e09e2299 while (iterator.hasNext()) { diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 603db501fe8491539edb2564a312fe69f9e07a63..4569aa6df0ef596f185235bfedb1ce058d1da62b 100644 +index 7357319e9186c9ffd878268ed9c1f4846ceb3ea9..91bd27148f5b699b72d56844ded76e0e25e2693c 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -527,8 +527,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0370-Implement-alternative-item-despawn-rate.patch b/patches/server/0369-Implement-alternative-item-despawn-rate.patch similarity index 100% rename from patches/server/0370-Implement-alternative-item-despawn-rate.patch rename to patches/server/0369-Implement-alternative-item-despawn-rate.patch diff --git a/patches/server/0371-Tracking-Range-Improvements.patch b/patches/server/0370-Tracking-Range-Improvements.patch similarity index 97% rename from patches/server/0371-Tracking-Range-Improvements.patch rename to patches/server/0370-Tracking-Range-Improvements.patch index e561d41a9..eb75f1951 100644 --- a/patches/server/0371-Tracking-Range-Improvements.patch +++ b/patches/server/0370-Tracking-Range-Improvements.patch @@ -8,7 +8,7 @@ Sets tracking range of watermobs to animals instead of misc and simplifies code Also ignores Enderdragon, defaulting it to Mojang's setting diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index f820931435d7e17261f9b7c37be036111e7156ef..fc0546a2bdc8754c1d9f9ff370127f225bd730c9 100644 +index 6f4c350f486aa70b94be8cf5a7b0e22599283ba9..dde0d2be31e686b4d5324affd03743345d8af2ed 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1832,6 +1832,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially diff --git a/patches/server/0372-Fix-items-vanishing-through-end-portal.patch b/patches/server/0371-Fix-items-vanishing-through-end-portal.patch similarity index 93% rename from patches/server/0372-Fix-items-vanishing-through-end-portal.patch rename to patches/server/0371-Fix-items-vanishing-through-end-portal.patch index cac7fe143..59a8cc7af 100644 --- a/patches/server/0372-Fix-items-vanishing-through-end-portal.patch +++ b/patches/server/0371-Fix-items-vanishing-through-end-portal.patch @@ -13,7 +13,7 @@ Quickly loading the exact world spawn chunk before searching the heightmap resolves the issue without having to load all spawn chunks. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 93f2db7b9c601654d7cae199369774def4b3adca..8212e868e482d7b7495eac001bfa1c5ee3c752f1 100644 +index fe2535aa505232df1b6c5a71e463c5c0004b4de6..6084222c0f46534c4cba81fa32478a467114cceb 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3004,6 +3004,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0373-implement-optional-per-player-mob-spawns.patch b/patches/server/0372-implement-optional-per-player-mob-spawns.patch similarity index 99% rename from patches/server/0373-implement-optional-per-player-mob-spawns.patch rename to patches/server/0372-implement-optional-per-player-mob-spawns.patch index 316de9fa6..7325077bf 100644 --- a/patches/server/0373-implement-optional-per-player-mob-spawns.patch +++ b/patches/server/0372-implement-optional-per-player-mob-spawns.patch @@ -545,7 +545,7 @@ index 0000000000000000000000000000000000000000..11de56afaf059b00fa5bec293516bcdc + } +} diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index c795575e5ae259e78dbd3cb265a2eeeabee6c789..d329d07532d4e4017a4c5cfad7b18795ab8a5186 100644 +index dde0d2be31e686b4d5324affd03743345d8af2ed..7e62a86e4ab376c47340d96620f6b1df19fa95ca 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -145,6 +145,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -591,7 +591,7 @@ index c795575e5ae259e78dbd3cb265a2eeeabee6c789..d329d07532d4e4017a4c5cfad7b18795 double d0 = (double) SectionPos.sectionToBlockCoord(pos.x, 8); double d1 = (double) SectionPos.sectionToBlockCoord(pos.z, 8); diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 6f8b4d9974c8fb549d69e9b46ab05958c9ce0ba7..666626752b9f05c6c33fee709865526b738acaf6 100644 +index 734b204d53a4b9e9b1112efe3a50b53cf1aa9f47..26f99965e63d36ce4b8cd0482ae21b0c37994caa 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -754,7 +754,22 @@ public class ServerChunkCache extends ChunkSource { @@ -619,7 +619,7 @@ index 6f8b4d9974c8fb549d69e9b46ab05958c9ce0ba7..666626752b9f05c6c33fee709865526b this.lastSpawnState = spawnercreature_d; diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 648e7b258eef32213c512781faffa840eedebec6..e896224cec9eede23a890975888076bfe94f8a0a 100644 +index 6ecf85579acb186f076f258368051a4ae09c3354..14f88e575f46d81175eaa04b3e7294990e749a14 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -90,12 +90,7 @@ import net.minecraft.world.damagesource.DamageSource; diff --git a/patches/server/0374-Avoid-hopper-searches-if-there-are-no-items.patch b/patches/server/0373-Avoid-hopper-searches-if-there-are-no-items.patch similarity index 98% rename from patches/server/0374-Avoid-hopper-searches-if-there-are-no-items.patch rename to patches/server/0373-Avoid-hopper-searches-if-there-are-no-items.patch index 4b30221d3..587ef0a60 100644 --- a/patches/server/0374-Avoid-hopper-searches-if-there-are-no-items.patch +++ b/patches/server/0373-Avoid-hopper-searches-if-there-are-no-items.patch @@ -14,7 +14,7 @@ And since minecart hoppers are used _very_ rarely near we can avoid alot of sear Combined, this adds up a lot. diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 4569aa6df0ef596f185235bfedb1ce058d1da62b..02c4396f3f42c1ec387eae9b2f7815f6e9f9e1c4 100644 +index 91bd27148f5b699b72d56844ded76e0e25e2693c..a4f446eff2a9e7f8ab99b156d0efe45d60e6c575 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -991,7 +991,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0375-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0374-Bees-get-gravity-in-void.-Fixes-MC-167279.patch similarity index 100% rename from patches/server/0375-Bees-get-gravity-in-void.-Fixes-MC-167279.patch rename to patches/server/0374-Bees-get-gravity-in-void.-Fixes-MC-167279.patch diff --git a/patches/server/0376-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0375-Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 96% rename from patches/server/0376-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/server/0375-Optimise-getChunkAt-calls-for-loaded-chunks.patch index 96c9a596f..ae9005672 100644 --- a/patches/server/0376-Optimise-getChunkAt-calls-for-loaded-chunks.patch +++ b/patches/server/0375-Optimise-getChunkAt-calls-for-loaded-chunks.patch @@ -7,7 +7,7 @@ bypass the need to get a player chunk, then get the either, then unwrap it... diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 666626752b9f05c6c33fee709865526b738acaf6..c22b7cfdcff46161444cd145a50678e982f2f645 100644 +index 26f99965e63d36ce4b8cd0482ae21b0c37994caa..c849ded5448112289a3c37f05dc49fadbf619f81 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -451,6 +451,12 @@ public class ServerChunkCache extends ChunkSource { diff --git a/patches/server/0377-Add-debug-for-sync-chunk-loads.patch b/patches/server/0376-Add-debug-for-sync-chunk-loads.patch similarity index 98% rename from patches/server/0377-Add-debug-for-sync-chunk-loads.patch rename to patches/server/0376-Add-debug-for-sync-chunk-loads.patch index 42c524336..388b94680 100644 --- a/patches/server/0377-Add-debug-for-sync-chunk-loads.patch +++ b/patches/server/0376-Add-debug-for-sync-chunk-loads.patch @@ -279,7 +279,7 @@ index 0000000000000000000000000000000000000000..524f33371b9de1d4dd6972fe59ffbe18 + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index c22b7cfdcff46161444cd145a50678e982f2f645..acb710c25a3b1a151a6dbf579a871529f077b70f 100644 +index c849ded5448112289a3c37f05dc49fadbf619f81..77f88e081991e85d03540e30b9def5dac9ad59be 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -483,6 +483,7 @@ public class ServerChunkCache extends ChunkSource { @@ -291,7 +291,7 @@ index c22b7cfdcff46161444cd145a50678e982f2f645..acb710c25a3b1a151a6dbf579a871529 chunkproviderserver_a.managedBlock(completablefuture::isDone); com.destroystokyo.paper.io.chunk.ChunkTaskManager.popChunkWait(); // Paper - async chunk debug diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 0b457e12a590cc465a1d0a89a016f3f79504a9b1..3b7585760483b077783a28de8d04ba438eb25c16 100644 +index fcf5c7b28e927db977ad5b851edaf68e59de8d5b..87a18dcbfbb55410f04e99e84958f22f21193066 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -280,6 +280,12 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl diff --git a/patches/server/0378-Allow-overriding-the-java-version-check.patch b/patches/server/0377-Allow-overriding-the-java-version-check.patch similarity index 89% rename from patches/server/0378-Allow-overriding-the-java-version-check.patch rename to patches/server/0377-Allow-overriding-the-java-version-check.patch index 983fc278c..97ba0c076 100644 --- a/patches/server/0378-Allow-overriding-the-java-version-check.patch +++ b/patches/server/0377-Allow-overriding-the-java-version-check.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Allow overriding the java version check -DPaper.IgnoreJavaVersion=true diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index f68d44721c91c20a7e4abffe26dabff8b5d2c3ce..fd48cfe3dfaf7c867becfbf90246af2f33a74612 100644 +index b14fa970679dc000cd203949c73f117d4573be9e..3f219234355edc961f07ae1a75759b6e44ddcfdf 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -185,7 +185,7 @@ public class Main { diff --git a/patches/server/0379-Add-ThrownEggHatchEvent.patch b/patches/server/0378-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/0379-Add-ThrownEggHatchEvent.patch rename to patches/server/0378-Add-ThrownEggHatchEvent.patch diff --git a/patches/server/0380-Entity-Jump-API.patch b/patches/server/0379-Entity-Jump-API.patch similarity index 100% rename from patches/server/0380-Entity-Jump-API.patch rename to patches/server/0379-Entity-Jump-API.patch diff --git a/patches/server/0381-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0380-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 97% rename from patches/server/0381-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/server/0380-Add-option-to-nerf-pigmen-from-nether-portals.patch index d55e08498..55f512e26 100644 --- a/patches/server/0381-Add-option-to-nerf-pigmen-from-nether-portals.patch +++ b/patches/server/0380-Add-option-to-nerf-pigmen-from-nether-portals.patch @@ -21,7 +21,7 @@ index f2e4939c8144b9bc7441130302ab3e2358c42063..3d14a7dbcc6bc46141596a7e04f790bf private void lightQueueSize() { lightQueueSize = getInt("light-queue-size", lightQueueSize); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 9f3447ba69fcbfb60b778b60851a0caf4cd3ddf9..c1b52e5a54bc7a2a623f7b2ec439ca9dbc76328d 100644 +index 6084222c0f46534c4cba81fa32478a467114cceb..7e314890b52621f18ff697a545e3e289a0c0d989 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -328,6 +328,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0382-Make-the-GUI-graph-fancier.patch b/patches/server/0381-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0382-Make-the-GUI-graph-fancier.patch rename to patches/server/0381-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0383-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0382-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/server/0383-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/server/0382-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/server/0384-Prevent-teleporting-dead-entities.patch b/patches/server/0383-Prevent-teleporting-dead-entities.patch similarity index 100% rename from patches/server/0384-Prevent-teleporting-dead-entities.patch rename to patches/server/0383-Prevent-teleporting-dead-entities.patch diff --git a/patches/server/0385-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0384-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/0385-Validate-tripwire-hook-placement-before-update.patch rename to patches/server/0384-Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/0386-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0385-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from patches/server/0386-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/server/0385-Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/patches/server/0387-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0386-Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from patches/server/0387-Configurable-chance-of-villager-zombie-infection.patch rename to patches/server/0386-Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/server/0388-Optimise-Chunk-getFluid.patch b/patches/server/0387-Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/server/0388-Optimise-Chunk-getFluid.patch rename to patches/server/0387-Optimise-Chunk-getFluid.patch diff --git a/patches/server/0389-Optimise-TickListServer-by-rewriting-it.patch b/patches/server/0388-Optimise-TickListServer-by-rewriting-it.patch similarity index 99% rename from patches/server/0389-Optimise-TickListServer-by-rewriting-it.patch rename to patches/server/0388-Optimise-TickListServer-by-rewriting-it.patch index 0aa0cdd86..17dc66e25 100644 --- a/patches/server/0389-Optimise-TickListServer-by-rewriting-it.patch +++ b/patches/server/0388-Optimise-TickListServer-by-rewriting-it.patch @@ -889,7 +889,7 @@ index 0000000000000000000000000000000000000000..118988c39e58f28e8a2851792b9c014f + } +} diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java -index 8fff5580a88fd1643845967eb7bdab2630777e91..97faf7ece336928f22e518a14653b4fbc672d876 100644 +index 5ff96851e7f7c51c365dde0d24da49be6412ab82..55f355d1218ddb3f320752666407151291c0f398 100644 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java @@ -86,6 +86,19 @@ public class ChunkHolder { @@ -924,7 +924,7 @@ index 8fff5580a88fd1643845967eb7bdab2630777e91..97faf7ece336928f22e518a14653b4fb }); // Paper end diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index acb710c25a3b1a151a6dbf579a871529f077b70f..b0ff4a46807994e3afe4c8dc3810ecdd43b68025 100644 +index 77f88e081991e85d03540e30b9def5dac9ad59be..43007f8cc9a88d7e6fb435551edac4d93a5668a9 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -220,6 +220,12 @@ public class ServerChunkCache extends ChunkSource { @@ -941,7 +941,7 @@ index acb710c25a3b1a151a6dbf579a871529f077b70f..b0ff4a46807994e3afe4c8dc3810ecdd public ServerChunkCache(ServerLevel world, LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, StructureManager structureManager, Executor workerExecutor, ChunkGenerator chunkGenerator, int viewDistance, boolean flag, ChunkProgressListener worldGenerationProgressListener, ChunkStatusUpdateListener chunkstatusupdatelistener, Supplier supplier) { this.level = world; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 3b7585760483b077783a28de8d04ba438eb25c16..e687eba2029b114a3272037c7be11160076afbcf 100644 +index 87a18dcbfbb55410f04e99e84958f22f21193066..cb1efab5c5cfd47cfbdab609009cc6a5cd6f1dc4 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -295,6 +295,15 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl diff --git a/patches/server/0390-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0389-Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 98% rename from patches/server/0390-Pillager-patrol-spawn-settings-and-per-player-option.patch rename to patches/server/0389-Pillager-patrol-spawn-settings-and-per-player-option.patch index 37c03bc19..16a7d2d77 100644 --- a/patches/server/0390-Pillager-patrol-spawn-settings-and-per-player-option.patch +++ b/patches/server/0389-Pillager-patrol-spawn-settings-and-per-player-option.patch @@ -36,7 +36,7 @@ index 9dc8a9e49cac89e236d9fa0c053b70bf10ed6f6e..2d038185846ae34bc301ab93d881022a private void entitiesTargetWithFollowRange() { entitiesTargetWithFollowRange = getBoolean("entities-target-with-follow-range", entitiesTargetWithFollowRange); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index e896224cec9eede23a890975888076bfe94f8a0a..6f976946f742b4139b01dfa692a901b15f02a836 100644 +index 14f88e575f46d81175eaa04b3e7294990e749a14..f758a85306b9df817e60577b7ffcf777a4c82ee8 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -214,6 +214,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0391-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0390-Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 100% rename from patches/server/0391-Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to patches/server/0390-Remote-Connections-shouldn-t-hold-up-shutdown.patch diff --git a/patches/server/0392-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0391-Do-not-allow-bees-to-load-chunks-for-beehives.patch similarity index 100% rename from patches/server/0392-Do-not-allow-bees-to-load-chunks-for-beehives.patch rename to patches/server/0391-Do-not-allow-bees-to-load-chunks-for-beehives.patch diff --git a/patches/server/0393-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0392-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 93% rename from patches/server/0393-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/server/0392-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch index e86bcda92..4aa422796 100644 --- a/patches/server/0393-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch +++ b/patches/server/0392-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch @@ -7,7 +7,7 @@ Suspected case would be around the technique used in .stopRiding Stack will identify any causer of this and warn instead of crashing. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index d4240b0405520cb292b4cbd4f70ebcd2edc30bbf..acd7318af28022b196d7397601d3511d7f199821 100644 +index 7e62a86e4ab376c47340d96620f6b1df19fa95ca..f75a78f60565be1c8e8b0ce5f3937441f59e1f29 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1507,6 +1507,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -26,7 +26,7 @@ index d4240b0405520cb292b4cbd4f70ebcd2edc30bbf..acd7318af28022b196d7397601d3511d EntityType entitytypes = entity.getType(); int i = entitytypes.clientTrackingRange() * 16; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index e687eba2029b114a3272037c7be11160076afbcf..d2acfa3de9f5ac380b6bde1d4e8406db9e182371 100644 +index cb1efab5c5cfd47cfbdab609009cc6a5cd6f1dc4..fca0453ee83f7592e7ad7c572e238202247a93a1 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2106,7 +2106,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl diff --git a/patches/server/0394-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0393-Optimize-Collision-to-not-load-chunks.patch similarity index 98% rename from patches/server/0394-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/0393-Optimize-Collision-to-not-load-chunks.patch index b1a80407d..15d6b8b21 100644 --- a/patches/server/0394-Optimize-Collision-to-not-load-chunks.patch +++ b/patches/server/0393-Optimize-Collision-to-not-load-chunks.patch @@ -26,7 +26,7 @@ index 2730923bd0bf3b0f928765b9e09e2299fa9a393d..f98a1c32e0c209473cf7268cbd8245ab entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ()); } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c1b52e5a54bc7a2a623f7b2ec439ca9dbc76328d..7120400af3e6a36f9b097fe9dfaff655209b03ce 100644 +index 7e314890b52621f18ff697a545e3e289a0c0d989..fa63a52cba5355612ce417f4bb8077a89ce59398 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -172,6 +172,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0395-Don-t-tick-dead-players.patch b/patches/server/0394-Don-t-tick-dead-players.patch similarity index 91% rename from patches/server/0395-Don-t-tick-dead-players.patch rename to patches/server/0394-Don-t-tick-dead-players.patch index bb688ed97..21ed36d66 100644 --- a/patches/server/0395-Don-t-tick-dead-players.patch +++ b/patches/server/0394-Don-t-tick-dead-players.patch @@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else. This is safe because Spectators are skipped in unloaded chunks too in vanilla. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 6f976946f742b4139b01dfa692a901b15f02a836..e4a5b89a12c52ccca4f72823e8d7a5d5a689ff16 100644 +index f758a85306b9df817e60577b7ffcf777a4c82ee8..ff965e67ba260a7a8e94514f8eca745f81c200b2 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -638,7 +638,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0396-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0395-Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 100% rename from patches/server/0396-Dead-Player-s-shouldn-t-be-able-to-move.patch rename to patches/server/0395-Dead-Player-s-shouldn-t-be-able-to-move.patch diff --git a/patches/server/0397-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/patches/server/0396-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch similarity index 98% rename from patches/server/0397-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch rename to patches/server/0396-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch index 7eaf93e6f..e378e35b2 100644 --- a/patches/server/0397-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch +++ b/patches/server/0396-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch @@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..f6ff4d8132a95895680f5bc81f8f873e + } +} diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java -index 9c88426ab1275ee5fb6e28be8b213533dc4ab859..87c9a5c1b43f6010898d72136b5eb9973299b723 100644 +index 530916b8d0c5eb3b7b379100df1e6e0d4ade273d..4d82abf234f67af124dff3f726a6a2e39313a780 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -614,7 +614,7 @@ public final class MCUtil { @@ -70,7 +70,7 @@ index 9c88426ab1275ee5fb6e28be8b213533dc4ab859..87c9a5c1b43f6010898d72136b5eb997 List allChunks = new ArrayList<>(visibleChunks.values()); List players = world.players; diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index acd7318af28022b196d7397601d3511d7f199821..6947bc74216704d1848387e2b2a8bb57d5105c0f 100644 +index f75a78f60565be1c8e8b0ce5f3937441f59e1f29..22f6898b96c68fa53ca5900985c18a6f2f5a8b57 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -112,9 +112,36 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -233,7 +233,7 @@ index acd7318af28022b196d7397601d3511d7f199821..6947bc74216704d1848387e2b2a8bb57 while (objectbidirectionaliterator.hasNext()) { Entry entry = (Entry) objectbidirectionaliterator.next(); diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index b0ff4a46807994e3afe4c8dc3810ecdd43b68025..d8cd652f76232b43b104b11247682288e99d9521 100644 +index 43007f8cc9a88d7e6fb435551edac4d93a5668a9..6d999e0de0497114e46445981c64ee70f882c782 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -767,7 +767,7 @@ public class ServerChunkCache extends ChunkSource { diff --git a/patches/server/0398-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch b/patches/server/0397-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch similarity index 97% rename from patches/server/0398-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch rename to patches/server/0397-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch index f2e59de39..a9d8f548a 100644 --- a/patches/server/0398-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch +++ b/patches/server/0397-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch @@ -30,7 +30,7 @@ In a view distance of 15, chunk loading performance was visually faster on the c Flying at high speed in spectator mode was able to keep up with chunk loading (as long as they are already generated) diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java -index 72f9e1978394afb6e5cc1c0d085d41586d69b84e..aa0698508de8fba6e84c20ac4d3aebb99a075c25 100644 +index b47b7dce26805badd422c1867733ff4bfd00e9f4..b9cdbf8acccfd6b207a0116f068168f3b8c8e17d 100644 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java @@ -16,6 +16,7 @@ import java.util.Map; @@ -56,7 +56,7 @@ index da93d38fe63035e4ff198ada84a4431f52d97c01..ddbc8cb712c50038922eded75dd6ca85 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 494a3afaaa0e3496d30e8d97edbab62b21610dfe..fa3a9d763f7072c68b126ce95fee191aab576e43 100644 +index ac53eb7bc69e1566d20df3b7cba33034c344952a..f1c08a811c05a29eda4686c1143cc27fd91d7311 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1112,6 +1112,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index b464db85829f2f97926791056b339b937e25ed03..c8c873f9e7fd1a8ea2d32f37be6d221408b7687d 100644 +index 0c76218134bdf8d80e3680227934ff5f70c26df2..0bb931ae8faa8e1fe36895d8321a9b36d325c3ed 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -1001,6 +1001,7 @@ public class ServerChunkCache extends ChunkSource { diff --git a/patches/server/0416-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0415-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/0416-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/server/0415-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/0417-Broadcast-join-message-to-console.patch b/patches/server/0416-Broadcast-join-message-to-console.patch similarity index 100% rename from patches/server/0417-Broadcast-join-message-to-console.patch rename to patches/server/0416-Broadcast-join-message-to-console.patch diff --git a/patches/server/0418-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0417-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch similarity index 96% rename from patches/server/0418-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to patches/server/0417-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch index 41b47ea38..f74371666 100644 --- a/patches/server/0418-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch +++ b/patches/server/0417-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch @@ -28,7 +28,7 @@ receives a deterministic result, and should no longer require 1 tick delays anymore. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index dfe7af5568de8d9511f18a6894026f0f1143a0ff..419e928c853d921dccc36471559962caf5006117 100644 +index 7ef52d0ae501312590802acb5f54fcf6f7cdac9e..c1b7e9d515fc833759707ab3c5c952320dec103e 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1600,6 +1600,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -40,7 +40,7 @@ index dfe7af5568de8d9511f18a6894026f0f1143a0ff..419e928c853d921dccc36471559962ca if (!(entity instanceof EnderDragonPart)) { EntityType entitytypes = entity.getType(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 9500fb90db765095afb1ecd91bbef6099cdc7a4b..63f20e7adf80a1b81438262087e33c3a1e63ca7f 100644 +index c2dd937938e120472d0a2609c1afef693a342682..05e520165a86eb52e1fd4130b6f2ccc4c838934a 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -237,6 +237,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0419-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0418-Load-Chunks-for-Login-Asynchronously.patch similarity index 100% rename from patches/server/0419-Load-Chunks-for-Login-Asynchronously.patch rename to patches/server/0418-Load-Chunks-for-Login-Asynchronously.patch diff --git a/patches/server/0420-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0419-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 93% rename from patches/server/0420-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/server/0419-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch index af838ecc2..159a1c849 100644 --- a/patches/server/0420-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch +++ b/patches/server/0419-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch @@ -7,7 +7,7 @@ The code following this has better support for null worlds to move them back to the world spawn. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index d9ed724d07309f23c91f20c9af888cce5127e323..16257d3d0e822d562e1a309fc6ab109dbdd7c13e 100644 +index 32323729f913d27170fca0e69346e8d2943089af..6bc6800f8ec3900b552c5da910db577649f5d9e0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2000,9 +2000,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0421-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0420-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/server/0421-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/server/0420-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/server/0422-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/patches/server/0421-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch similarity index 95% rename from patches/server/0422-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch rename to patches/server/0421-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch index 727c614ce..bf1bca1cb 100644 --- a/patches/server/0422-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch +++ b/patches/server/0421-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch @@ -14,7 +14,7 @@ Use an ArrayDeque to store this Queue We make sure to also implement a pattern that is recursion safe too. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 4fde1b06f0f10b59386b7f510e2ca494d507397b..d36b38088adf19273cc5ee55788090da40f4b746 100644 +index c1b7e9d515fc833759707ab3c5c952320dec103e..c643919e17081c85717b0b00c227b914d7abcc0a 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -178,17 +178,29 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0423-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0422-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0423-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/server/0422-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0424-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0423-Add-phantom-creative-and-insomniac-controls.patch similarity index 97% rename from patches/server/0424-Add-phantom-creative-and-insomniac-controls.patch rename to patches/server/0423-Add-phantom-creative-and-insomniac-controls.patch index aba773d80..4a2bdf02b 100644 --- a/patches/server/0424-Add-phantom-creative-and-insomniac-controls.patch +++ b/patches/server/0423-Add-phantom-creative-and-insomniac-controls.patch @@ -35,7 +35,7 @@ index d17b75ad13bbc8a38cdc2f2d77ee5d88438cec31..8fb89326395a7e70982c0d757b506565 private EntitySelector() {} // Paper start diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java -index f69ad3b2f19a71f1e4a1a8fb37ac63df78548871..2257391ad42219efda0b6a11f1ca0f66e377e412 100644 +index d2a3927a263c445e647a4bbc5fe12addaf290c0e..6dbf806b5984ae16e747dce350c7cffcf0b190ad 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java @@ -547,6 +547,7 @@ public class Phantom extends FlyingMob implements Enemy { diff --git a/patches/server/0425-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0424-Fix-numerous-item-duplication-issues-and-teleport-is.patch similarity index 98% rename from patches/server/0425-Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to patches/server/0424-Fix-numerous-item-duplication-issues-and-teleport-is.patch index fc2375e14..40bd1ce55 100644 --- a/patches/server/0425-Fix-numerous-item-duplication-issues-and-teleport-is.patch +++ b/patches/server/0424-Fix-numerous-item-duplication-issues-and-teleport-is.patch @@ -16,7 +16,7 @@ So even if something NEW comes up, it would be impossible to drop the same item twice because the source was destroyed. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index de7e841ef7e9589ab49c7df040c59387b76f12af..5bdb1ce8875c276e5f7997db83b097b910c0a136 100644 +index 6bc6800f8ec3900b552c5da910db577649f5d9e0..677124d720105e9bda9d05a1fcc46ce10f44539d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2147,11 +2147,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0426-Implement-Brigadier-Mojang-API.patch b/patches/server/0425-Implement-Brigadier-Mojang-API.patch similarity index 98% rename from patches/server/0426-Implement-Brigadier-Mojang-API.patch rename to patches/server/0425-Implement-Brigadier-Mojang-API.patch index fc23c8555..47f752302 100644 --- a/patches/server/0426-Implement-Brigadier-Mojang-API.patch +++ b/patches/server/0425-Implement-Brigadier-Mojang-API.patch @@ -10,7 +10,7 @@ Adds CommandRegisteredEvent - Allows manipulating the CommandNode to add more children/metadata for the client diff --git a/build.gradle.kts b/build.gradle.kts -index 98899f57a859a78dc4445dae6c5448818e3cdd2d..81e176070c1f5bbc3deb062a4663bdf66bee14b5 100644 +index ff26c51fe2a04bd8a18a9c4ee9ca004f32fae4ab..c4aac1360a7fce1ae95fa52ecb8a861a1c196edb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,6 +21,7 @@ repositories { @@ -81,7 +81,7 @@ index 13e358e0eac3bfd426d924b6f745e001df76c64a..7156dea53be828acd01734fa1f9f7b9a event.getPlayer().getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 0d8a8b3d7a13e2384f8614bdc190768c03bb98c2..776d2d663dcbdd935a7ed7927618e2be68a562c4 100644 +index c57b5cf7d61eab5a45e3fa69e8804fd0ef4a54ad..ba2bff392a60a2d39f397be97d81f14430f773b3 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -760,8 +760,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0427-Villager-Restocks-API.patch b/patches/server/0426-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0427-Villager-Restocks-API.patch rename to patches/server/0426-Villager-Restocks-API.patch diff --git a/patches/server/0428-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0427-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 95% rename from patches/server/0428-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/server/0427-Validate-PickItem-Packet-and-kick-for-invalid.patch index e33e36109..a17a8b3e6 100644 --- a/patches/server/0428-Validate-PickItem-Packet-and-kick-for-invalid.patch +++ b/patches/server/0427-Validate-PickItem-Packet-and-kick-for-invalid.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 776d2d663dcbdd935a7ed7927618e2be68a562c4..7e4e2174665eaf0277c0b547fe6c9e05fdf59c81 100644 +index ba2bff392a60a2d39f397be97d81f14430f773b3..f936386b67027b4e8782367cf62ab3332c0711f3 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -877,7 +877,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0429-Expose-game-version.patch b/patches/server/0428-Expose-game-version.patch similarity index 100% rename from patches/server/0429-Expose-game-version.patch rename to patches/server/0428-Expose-game-version.patch diff --git a/patches/server/0430-Optimize-Voxel-Shape-Merging.patch b/patches/server/0429-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/0430-Optimize-Voxel-Shape-Merging.patch rename to patches/server/0429-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/0431-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0430-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 93% rename from patches/server/0431-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/server/0430-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch index dba06499e..a3e85036f 100644 --- a/patches/server/0431-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch +++ b/patches/server/0430-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch @@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache. Set system properly at server startup if not set already to help protect from this. diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 2904cbda94a8fb986d94022c11061f98938237dd..6ebd0f6053929beb246993b5a1b682b9971baf0b 100644 +index 15d6975e6470e1affad9adc73964a720a3de36e9..daa881823f9a0757211e4fece8ebd9225f8b41bb 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -28,6 +28,7 @@ public class Main { diff --git a/patches/server/0432-Implement-Mob-Goal-API.patch b/patches/server/0431-Implement-Mob-Goal-API.patch similarity index 99% rename from patches/server/0432-Implement-Mob-Goal-API.patch rename to patches/server/0431-Implement-Mob-Goal-API.patch index 8a8c883f7..ac8cef16a 100644 --- a/patches/server/0432-Implement-Mob-Goal-API.patch +++ b/patches/server/0431-Implement-Mob-Goal-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API diff --git a/build.gradle.kts b/build.gradle.kts -index 40e1b4322db6bf79ae9511fbf8abab60bde9f127..2e8424beaa1f8a14d3541dad9c258da80ab915d5 100644 +index c4aac1360a7fce1ae95fa52ecb8a861a1c196edb..f83c5c672d7728946d4c4aef6c496a73da41fc61 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -52,6 +52,7 @@ dependencies { diff --git a/patches/server/0433-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0432-Use-distance-map-to-optimise-entity-tracker.patch similarity index 100% rename from patches/server/0433-Use-distance-map-to-optimise-entity-tracker.patch rename to patches/server/0432-Use-distance-map-to-optimise-entity-tracker.patch diff --git a/patches/server/0434-Optimize-isOutsideRange-to-use-distance-maps.patch b/patches/server/0433-Optimize-isOutsideRange-to-use-distance-maps.patch similarity index 100% rename from patches/server/0434-Optimize-isOutsideRange-to-use-distance-maps.patch rename to patches/server/0433-Optimize-isOutsideRange-to-use-distance-maps.patch diff --git a/patches/server/0435-Add-villager-reputation-API.patch b/patches/server/0434-Add-villager-reputation-API.patch similarity index 100% rename from patches/server/0435-Add-villager-reputation-API.patch rename to patches/server/0434-Add-villager-reputation-API.patch diff --git a/patches/server/0436-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0435-Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 100% rename from patches/server/0436-Option-for-maximum-exp-value-when-merging-orbs.patch rename to patches/server/0435-Option-for-maximum-exp-value-when-merging-orbs.patch diff --git a/patches/server/0437-ExperienceOrbMergeEvent.patch b/patches/server/0436-ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/server/0437-ExperienceOrbMergeEvent.patch rename to patches/server/0436-ExperienceOrbMergeEvent.patch diff --git a/patches/server/0438-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0437-Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/0438-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/server/0437-Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/0439-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0438-Optimize-brigadier-child-sorting-performance.patch similarity index 100% rename from patches/server/0439-Optimize-brigadier-child-sorting-performance.patch rename to patches/server/0438-Optimize-brigadier-child-sorting-performance.patch diff --git a/patches/server/0440-Potential-bed-API.patch b/patches/server/0439-Potential-bed-API.patch similarity index 100% rename from patches/server/0440-Potential-bed-API.patch rename to patches/server/0439-Potential-bed-API.patch diff --git a/patches/server/0441-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0440-Wait-for-Async-Tasks-during-shutdown.patch similarity index 96% rename from patches/server/0441-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/server/0440-Wait-for-Async-Tasks-during-shutdown.patch index 9f0cd3912..2f9a66559 100644 --- a/patches/server/0441-Wait-for-Async-Tasks-during-shutdown.patch +++ b/patches/server/0440-Wait-for-Async-Tasks-during-shutdown.patch @@ -10,7 +10,7 @@ Adds a 5 second grace period for any async tasks to finish and warns if any are still running after that delay just as reload does. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d7023cb0974f6c28a0fb8a0a6e5a6600fe30d3e3..11dbe48c8a8c29cd28d725c43505e326a6e626ff 100644 +index ff17bd6e7ccd82201256a2c3568297c3191b7e1f..0e6ec02b011eee8c75ddc6f7db254df735be8e91 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -945,6 +945,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop> completablefuture = (CompletableFuture) this.futures.get(i); diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 39c7ffe656b6e1217d1e7bcf45f68501ed7e015d..07ecd8fd4d0806309c2ac3a465f1ddae3b164e60 100644 +index 0b2329d9ab2040e0793c7920307474c347c3117e..3464593f1c1af6c6b36549496bc85f2e51655ccf 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -97,6 +97,7 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureMana @@ -260,7 +260,7 @@ index 135d162a926bd258d2aa001b7d0ef880fd3f2fb9..334f1ad2a5ce236b58a82b1ef2e143ea public void close() throws IOException { // CraftBukkit start diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index d724ce8cf79fe7194e79da2e8e369777bbe638d2..1ffb6c12a2eadc0fee0081f980594ac8b5bc4277 100644 +index 16ff687d16bef0a485aacbcd80a3bcfa1bb08224..070bc5f072163b35868ef234e5f34c3eede4c934 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1003,6 +1003,37 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl diff --git a/patches/server/0457-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0456-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/server/0457-Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/server/0456-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/0458-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0457-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/0458-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/server/0457-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/0459-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0458-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from patches/server/0459-Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/server/0458-Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/server/0460-Fix-sand-duping.patch b/patches/server/0459-Fix-sand-duping.patch similarity index 100% rename from patches/server/0460-Fix-sand-duping.patch rename to patches/server/0459-Fix-sand-duping.patch diff --git a/patches/server/0461-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0460-Prevent-position-desync-in-playerconnection-causing-.patch similarity index 94% rename from patches/server/0461-Prevent-position-desync-in-playerconnection-causing-.patch rename to patches/server/0460-Prevent-position-desync-in-playerconnection-causing-.patch index ebc568335..1f7792cd5 100644 --- a/patches/server/0461-Prevent-position-desync-in-playerconnection-causing-.patch +++ b/patches/server/0460-Prevent-position-desync-in-playerconnection-causing-.patch @@ -14,7 +14,7 @@ behaviour, we need to move all of this dangerous logic outside of the move call and into an appropriate place in the tick method. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7e4e2174665eaf0277c0b547fe6c9e05fdf59c81..3493fb7f526cb713340475734f176aa52ade2d12 100644 +index f936386b67027b4e8782367cf62ab3332c0711f3..9c71188b1e193b4937eed07ff80c5a61b2db8643 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1345,6 +1345,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0462-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0461-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/0462-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/server/0461-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0463-Expose-Arrow-getItemStack.patch b/patches/server/0462-Expose-Arrow-getItemStack.patch similarity index 100% rename from patches/server/0463-Expose-Arrow-getItemStack.patch rename to patches/server/0462-Expose-Arrow-getItemStack.patch diff --git a/patches/server/0464-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0463-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/server/0464-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/server/0463-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/server/0465-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0464-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0465-Hide-sync-chunk-writes-behind-flag.patch rename to patches/server/0464-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0466-Add-permission-for-command-blocks.patch b/patches/server/0465-Add-permission-for-command-blocks.patch similarity index 98% rename from patches/server/0466-Add-permission-for-command-blocks.patch rename to patches/server/0465-Add-permission-for-command-blocks.patch index a6d7b47ff..6162ca76f 100644 --- a/patches/server/0466-Add-permission-for-command-blocks.patch +++ b/patches/server/0465-Add-permission-for-command-blocks.patch @@ -18,7 +18,7 @@ index a695e5a0c2e8846333ccb9aea499b5656af35163..c21c5134308a2a83fb50bfe37f05d19c return false; } else if (this.player.blockActionRestricted((Level) this.level, pos, this.gameModeForPlayer)) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ff0cb2ca36f052c55f2bd37b74c33b2192a03873..56e93709ce955a7c65dc2b058b5b8b8a646d1775 100644 +index 03a98771e828696fef2685fbde040293645a3c17..38f2b5ef4f4a96e5cf919eaa22f82a6909d9c909 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -788,7 +788,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0467-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0466-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 94% rename from patches/server/0467-Ensure-Entity-AABB-s-are-never-invalid.patch rename to patches/server/0466-Ensure-Entity-AABB-s-are-never-invalid.patch index 26b15ce29..43eef5df5 100644 --- a/patches/server/0467-Ensure-Entity-AABB-s-are-never-invalid.patch +++ b/patches/server/0466-Ensure-Entity-AABB-s-are-never-invalid.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ensure Entity AABB's are never invalid diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 51fae584a6ccb99a5423a415db433f5488465b1c..c1205f97775a8c0431a9fb200228f5677b9c52d0 100644 +index fe4b09f82d36e5d7e109c86e8f4c003e92ba4e9d..8aeb00440e90f3f72d5c6fde35b4067ebc452f2f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -560,7 +560,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0468-Optimize-WorldBorder-collision-checks-and-air.patch b/patches/server/0467-Optimize-WorldBorder-collision-checks-and-air.patch similarity index 97% rename from patches/server/0468-Optimize-WorldBorder-collision-checks-and-air.patch rename to patches/server/0467-Optimize-WorldBorder-collision-checks-and-air.patch index 27a9e0016..b4aa47912 100644 --- a/patches/server/0468-Optimize-WorldBorder-collision-checks-and-air.patch +++ b/patches/server/0467-Optimize-WorldBorder-collision-checks-and-air.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Optimize WorldBorder collision checks and air diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c1205f97775a8c0431a9fb200228f5677b9c52d0..0013f6f793cf70992ec83a454089aa800cd76ef5 100644 +index 8aeb00440e90f3f72d5c6fde35b4067ebc452f2f..7bfd4d85f5af889f6d6e13087331af12ea141238 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1044,7 +1044,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0469-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 100% rename from patches/server/0469-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch diff --git a/patches/server/0470-Paper-dumpitem-command.patch b/patches/server/0469-Paper-dumpitem-command.patch similarity index 100% rename from patches/server/0470-Paper-dumpitem-command.patch rename to patches/server/0469-Paper-dumpitem-command.patch diff --git a/patches/server/0471-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0470-Don-t-allow-null-UUID-s-for-chat.patch similarity index 100% rename from patches/server/0471-Don-t-allow-null-UUID-s-for-chat.patch rename to patches/server/0470-Don-t-allow-null-UUID-s-for-chat.patch diff --git a/patches/server/0472-Improve-Legacy-Component-serialization-size.patch b/patches/server/0471-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0472-Improve-Legacy-Component-serialization-size.patch rename to patches/server/0471-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0473-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0472-Stop-copy-on-write-operations-for-updating-light-dat.patch similarity index 100% rename from patches/server/0473-Stop-copy-on-write-operations-for-updating-light-dat.patch rename to patches/server/0472-Stop-copy-on-write-operations-for-updating-light-dat.patch diff --git a/patches/server/0474-Support-old-UUID-format-for-NBT.patch b/patches/server/0473-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/0474-Support-old-UUID-format-for-NBT.patch rename to patches/server/0473-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/0475-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0474-Clean-up-duplicated-GameProfile-Properties.patch similarity index 100% rename from patches/server/0475-Clean-up-duplicated-GameProfile-Properties.patch rename to patches/server/0474-Clean-up-duplicated-GameProfile-Properties.patch diff --git a/patches/server/0476-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0475-Convert-legacy-attributes-in-Item-Meta.patch similarity index 97% rename from patches/server/0476-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/server/0475-Convert-legacy-attributes-in-Item-Meta.patch index cf24e3253..02350badd 100644 --- a/patches/server/0476-Convert-legacy-attributes-in-Item-Meta.patch +++ b/patches/server/0475-Convert-legacy-attributes-in-Item-Meta.patch @@ -30,7 +30,7 @@ index 0520c45197629cbdc2777d9ae11eef572e793160..46c313d581b9af6aa0a48f97ae3cc800 public CraftAttributeMap(AttributeMap handle) { this.handle = handle; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 6252c3934d72b0d5e6809842bdd26d344cab98c6..daca454b375ab1d5900b6c3c9b6575463e47a3a9 100644 +index 9288588af4e0f9dd4c9711260cd4b73b66632bb7..55ad7f0d75d88c9848b65149002d2bd3a91719ca 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -479,7 +479,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { diff --git a/patches/server/0477-Remove-some-streams-from-structures.patch b/patches/server/0476-Remove-some-streams-from-structures.patch similarity index 100% rename from patches/server/0477-Remove-some-streams-from-structures.patch rename to patches/server/0476-Remove-some-streams-from-structures.patch diff --git a/patches/server/0478-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0477-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from patches/server/0478-Remove-streams-from-classes-related-villager-gossip.patch rename to patches/server/0477-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/patches/server/0479-Optimize-NibbleArray-to-use-pooled-buffers.patch b/patches/server/0478-Optimize-NibbleArray-to-use-pooled-buffers.patch similarity index 100% rename from patches/server/0479-Optimize-NibbleArray-to-use-pooled-buffers.patch rename to patches/server/0478-Optimize-NibbleArray-to-use-pooled-buffers.patch diff --git a/patches/server/0480-Support-components-in-ItemMeta.patch b/patches/server/0479-Support-components-in-ItemMeta.patch similarity index 97% rename from patches/server/0480-Support-components-in-ItemMeta.patch rename to patches/server/0479-Support-components-in-ItemMeta.patch index e512d7a84..5cd2df984 100644 --- a/patches/server/0480-Support-components-in-ItemMeta.patch +++ b/patches/server/0479-Support-components-in-ItemMeta.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Support components in ItemMeta diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index daca454b375ab1d5900b6c3c9b6575463e47a3a9..81738dac125a7247fff5e51fa595667ef25ba0a1 100644 +index 55ad7f0d75d88c9848b65149002d2bd3a91719ca..f9f1c5665adb703042ac7fca76ce2e9f8ebde9d3 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -873,11 +873,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { diff --git a/patches/server/0481-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0480-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch similarity index 100% rename from patches/server/0481-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch rename to patches/server/0480-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch diff --git a/patches/server/0482-Add-entity-liquid-API.patch b/patches/server/0481-Add-entity-liquid-API.patch similarity index 95% rename from patches/server/0482-Add-entity-liquid-API.patch rename to patches/server/0481-Add-entity-liquid-API.patch index 10d42ab9b..e63322022 100644 --- a/patches/server/0482-Add-entity-liquid-API.patch +++ b/patches/server/0481-Add-entity-liquid-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add entity liquid API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 0013f6f793cf70992ec83a454089aa800cd76ef5..6c4c82fb439a07f62668b625b6ba5d552949964d 100644 +index 7bfd4d85f5af889f6d6e13087331af12ea141238..2a0f72b98d025f1f140d9118937d41e7b172be60 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1339,7 +1339,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0483-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0482-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/0483-Update-itemstack-legacy-name-and-lore.patch rename to patches/server/0482-Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/0484-Spawn-player-in-correct-world-on-login.patch b/patches/server/0483-Spawn-player-in-correct-world-on-login.patch similarity index 94% rename from patches/server/0484-Spawn-player-in-correct-world-on-login.patch rename to patches/server/0483-Spawn-player-in-correct-world-on-login.patch index 2de440c5a..aa305e6ff 100644 --- a/patches/server/0484-Spawn-player-in-correct-world-on-login.patch +++ b/patches/server/0483-Spawn-player-in-correct-world-on-login.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Spawn player in correct world on login diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 7eb3088d47ff78198e01a3a12b0ce6abe9d6ca6b..66735bbc2528c5812c9df14ef7cd91cb69d903b2 100644 +index 4c5a3b53e0fbaeb1a9ae85b499a1e630255f88ea..247d4959c67d41d2f4995c2e19f4c652e97694f5 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -193,7 +193,18 @@ public abstract class PlayerList { diff --git a/patches/server/0485-Add-PrepareResultEvent.patch b/patches/server/0484-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0485-Add-PrepareResultEvent.patch rename to patches/server/0484-Add-PrepareResultEvent.patch diff --git a/patches/server/0486-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0485-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0486-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0485-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0487-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0486-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/server/0487-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0486-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/server/0488-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch similarity index 100% rename from patches/server/0488-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch rename to patches/server/0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch diff --git a/patches/server/0489-Improve-Chunk-Status-Transition-Speed.patch b/patches/server/0488-Improve-Chunk-Status-Transition-Speed.patch similarity index 97% rename from patches/server/0489-Improve-Chunk-Status-Transition-Speed.patch rename to patches/server/0488-Improve-Chunk-Status-Transition-Speed.patch index 505d09738..d3741c6cb 100644 --- a/patches/server/0489-Improve-Chunk-Status-Transition-Speed.patch +++ b/patches/server/0488-Improve-Chunk-Status-Transition-Speed.patch @@ -54,7 +54,7 @@ index 914678af675be57fecc92189c709da971b8b0ae8..779b230c18316242f4322d55b8b28900 public ChunkHolder(ChunkPos pos, int level, LevelHeightAccessor world, LevelLightEngine lightingProvider, ChunkHolder.LevelChangeListener levelUpdateListener, ChunkHolder.PlayerProvider playersWatchingChunkProvider) { this.futures = new AtomicReferenceArray(ChunkHolder.CHUNK_STATUSES.size()); diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index f0ad0eef003067f3b582d6eda2b89964fdd556ea..67a6524adc6dec62649bd9aa52fca0f98bb57e52 100644 +index b92eaa44434e2ee368b90d43f322cb8601d159bb..34cde879cdec317c31faa19afecdc1fbb0459dff 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -839,7 +839,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0490-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0489-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0490-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0489-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0491-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0490-Optimize-the-advancement-data-player-iteration-to-be.patch similarity index 100% rename from patches/server/0491-Optimize-the-advancement-data-player-iteration-to-be.patch rename to patches/server/0490-Optimize-the-advancement-data-player-iteration-to-be.patch diff --git a/patches/server/0492-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0491-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0492-Fix-arrows-never-despawning-MC-125757.patch rename to patches/server/0491-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0493-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0492-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0493-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/server/0492-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0494-Move-range-check-for-block-placing-up.patch b/patches/server/0493-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0494-Move-range-check-for-block-placing-up.patch rename to patches/server/0493-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0495-Fix-SPIGOT-5989.patch b/patches/server/0494-Fix-SPIGOT-5989.patch similarity index 97% rename from patches/server/0495-Fix-SPIGOT-5989.patch rename to patches/server/0494-Fix-SPIGOT-5989.patch index 9a4a10f31..0f21bf6b8 100644 --- a/patches/server/0495-Fix-SPIGOT-5989.patch +++ b/patches/server/0494-Fix-SPIGOT-5989.patch @@ -10,7 +10,7 @@ This fixes that by checking if the modified spawn location is still at a respawn anchor. diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 8ebbbecaebea8435232a2ccd9ad1062eb1dbbd6c..371ecab3f90be690b66db3992239bf5625eb1f6e 100644 +index f452cddd312793465dedb29c4e52d1c4dd1b4360..99e1e04c28934297f5585d623f0760f9d1bf9d19 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -77,6 +77,7 @@ import net.minecraft.world.level.GameRules; diff --git a/patches/server/0496-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0495-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0496-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/server/0495-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0497-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0496-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0497-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/server/0496-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0498-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0497-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0498-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/server/0497-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0499-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0498-Add-missing-strikeLighting-call-to-World-spigot-stri.patch similarity index 100% rename from patches/server/0499-Add-missing-strikeLighting-call-to-World-spigot-stri.patch rename to patches/server/0498-Add-missing-strikeLighting-call-to-World-spigot-stri.patch diff --git a/patches/server/0500-Incremental-player-saving.patch b/patches/server/0499-Incremental-player-saving.patch similarity index 95% rename from patches/server/0500-Incremental-player-saving.patch rename to patches/server/0499-Incremental-player-saving.patch index 381981615..7861ea880 100644 --- a/patches/server/0500-Incremental-player-saving.patch +++ b/patches/server/0499-Incremental-player-saving.patch @@ -25,7 +25,7 @@ index b67ba8f75e4a3358d7c2462918b85b0bf9b5a922..fdbd8b89bb8bf3b61f60b812b90483c9 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ccca42f9a1cd72e7f4fe21bd626b61f06c51e2e7..7ee2099dd22eaab384a16ef6a4ab50791fa16aac 100644 +index b4ad624270406d86fb2d18edc1d94979454e779c..bc839946fd2565ab34278991f09dfddc29257c1b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -955,7 +955,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index ff1ad929cb4494c7a97fe5e240421e25b7ff0857..40bd401191973c695f64b92d284363a77f051914 100644 +index e0f478f234f53d9bfb600ce69463ae6d8bfc100c..a678cab496bbeb757a3b60267e4cc3c0e54dfa2f 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -200,6 +200,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl diff --git a/patches/server/0619-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0618-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 95% rename from patches/server/0619-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0618-added-option-to-disable-pathfinding-updates-on-block.patch index ffe9cdd0e..9711e9646 100644 --- a/patches/server/0619-added-option-to-disable-pathfinding-updates-on-block.patch +++ b/patches/server/0618-added-option-to-disable-pathfinding-updates-on-block.patch @@ -20,7 +20,7 @@ index 7fc5bf095afa6d5881285b89091d2ff48ffb69f0..0eba516110b82d917c3374a9fe5bbf33 } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 40bd401191973c695f64b92d284363a77f051914..ab9938294e4b0044cb601953c06a04c15db9b9ec 100644 +index a678cab496bbeb757a3b60267e4cc3c0e54dfa2f..1e2139e7f82009e3f9a8b89b10a1fc031602d430 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1345,6 +1345,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl diff --git a/patches/server/0620-Inline-shift-direction-fields.patch b/patches/server/0619-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0620-Inline-shift-direction-fields.patch rename to patches/server/0619-Inline-shift-direction-fields.patch diff --git a/patches/server/0621-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0620-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0621-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0620-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0622-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0621-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0622-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0621-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0623-living-entity-allow-attribute-registration.patch b/patches/server/0622-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0623-living-entity-allow-attribute-registration.patch rename to patches/server/0622-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0624-fix-dead-slime-setSize-invincibility.patch b/patches/server/0623-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0624-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0623-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0625-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0624-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0625-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0624-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0626-misc-debugging-dumps.patch b/patches/server/0625-misc-debugging-dumps.patch similarity index 97% rename from patches/server/0626-misc-debugging-dumps.patch rename to patches/server/0625-misc-debugging-dumps.patch index 2e32d7e9a..ea7df4713 100644 --- a/patches/server/0626-misc-debugging-dumps.patch +++ b/patches/server/0625-misc-debugging-dumps.patch @@ -29,7 +29,7 @@ index 0000000000000000000000000000000000000000..2d5494d2813b773e60ddba6790b750a9 + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4c46dd3100133a2107e3f0c93c571d32edb62663..e9f5039403847a5483e67f95c900593e2f89cb60 100644 +index bba3905043a4943a920fe48be5b8b591bb19a9ea..280a7ca4ae3a0ed92dd411c8e4e3f253b60f9a9d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -913,6 +913,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop> { diff --git a/patches/server/0632-Improve-ServerGUI.patch b/patches/server/0631-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0632-Improve-ServerGUI.patch rename to patches/server/0631-Improve-ServerGUI.patch diff --git a/patches/server/0633-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0632-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch similarity index 100% rename from patches/server/0633-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch rename to patches/server/0632-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch diff --git a/patches/server/0634-fix-converting-txt-to-json-file.patch b/patches/server/0633-fix-converting-txt-to-json-file.patch similarity index 97% rename from patches/server/0634-fix-converting-txt-to-json-file.patch rename to patches/server/0633-fix-converting-txt-to-json-file.patch index f031b8b41..2200c5139 100644 --- a/patches/server/0634-fix-converting-txt-to-json-file.patch +++ b/patches/server/0633-fix-converting-txt-to-json-file.patch @@ -48,7 +48,7 @@ index a5c1114f9b323e8a49c84d0e68461e473bbcd690..eadacfa8449336c024f6154f46bb514d if (!OldUsersConverter.serverReadyAfterUserconversion(this)) { return false; diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 14d0345ca49acb0a463df2fdfa6cfc7b6f856244..458188eb409a945fdaea68eb9681ba7625dd39cd 100644 +index 077a62f66af639f4506bc4d740e5906b9a5bee2e..41d59666ad40bb0a9c9a383afe845dd185b973c8 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -171,6 +171,7 @@ public abstract class PlayerList { diff --git a/patches/server/0635-Add-worldborder-events.patch b/patches/server/0634-Add-worldborder-events.patch similarity index 100% rename from patches/server/0635-Add-worldborder-events.patch rename to patches/server/0634-Add-worldborder-events.patch diff --git a/patches/server/0636-added-PlayerNameEntityEvent.patch b/patches/server/0635-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0636-added-PlayerNameEntityEvent.patch rename to patches/server/0635-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0637-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0636-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0637-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0636-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0638-Add-recipe-to-cook-events.patch b/patches/server/0637-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0638-Add-recipe-to-cook-events.patch rename to patches/server/0637-Add-recipe-to-cook-events.patch diff --git a/patches/server/0639-Add-Block-isValidTool.patch b/patches/server/0638-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0639-Add-Block-isValidTool.patch rename to patches/server/0638-Add-Block-isValidTool.patch diff --git a/patches/server/0640-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0639-Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/0640-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0639-Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/0641-Implement-Keyed-on-World.patch b/patches/server/0640-Implement-Keyed-on-World.patch similarity index 96% rename from patches/server/0641-Implement-Keyed-on-World.patch rename to patches/server/0640-Implement-Keyed-on-World.patch index a9b82a6aa..b82f128a5 100644 --- a/patches/server/0641-Implement-Keyed-on-World.patch +++ b/patches/server/0640-Implement-Keyed-on-World.patch @@ -34,7 +34,7 @@ index 989b6b91dc046e20332f0cef35105b290fdb2e43..fb18b1f0bbc5b87f6895086f6d6a7495 // Check if a World already exists with the UID. if (this.getWorld(world.getUID()) != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index e9ef6fbd174ca36b98f2d72bd9be4fdc2b033ca5..a1f0e15ac54a640dd5883288c0baa1d64fca239c 100644 +index 071214bf8776959f2240b89501cd9ded2e07fdd7..7b1b64dfbac25e19bc97762fd6d8d8b09c6b5489 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2586,6 +2586,11 @@ public class CraftWorld implements World { diff --git a/patches/server/0642-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0641-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0642-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0641-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0643-Item-Rarity-API.patch b/patches/server/0642-Item-Rarity-API.patch similarity index 93% rename from patches/server/0643-Item-Rarity-API.patch rename to patches/server/0642-Item-Rarity-API.patch index c6064a942..af15d3e78 100644 --- a/patches/server/0643-Item-Rarity-API.patch +++ b/patches/server/0642-Item-Rarity-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Item Rarity API diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index af60eff6d3665f152762fa1e5a36a2461efa2c98..63f998b4b3008854da66f78486e1d27172d9e0e0 100644 +index 008490f3bae5597a95aa0095e53ff9062f0070e3..ca160d2b2899625c0df3c629e844673362954e26 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -470,6 +470,20 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0644-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0643-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0644-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0643-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0645-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0644-copy-TESign-isEditable-from-snapshots.patch similarity index 100% rename from patches/server/0645-copy-TESign-isEditable-from-snapshots.patch rename to patches/server/0644-copy-TESign-isEditable-from-snapshots.patch diff --git a/patches/server/0646-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0645-Drop-carried-item-when-player-has-disconnected.patch similarity index 92% rename from patches/server/0646-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0645-Drop-carried-item-when-player-has-disconnected.patch index c74f156a3..7df8e940a 100644 --- a/patches/server/0646-Drop-carried-item-when-player-has-disconnected.patch +++ b/patches/server/0645-Drop-carried-item-when-player-has-disconnected.patch @@ -7,7 +7,7 @@ Fixes disappearance of held items, when a player gets disconnected and PlayerDro Closes #5036 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 458188eb409a945fdaea68eb9681ba7625dd39cd..22529dec70914a8b2ffdb8a4677eca23ac754249 100644 +index 41d59666ad40bb0a9c9a383afe845dd185b973c8..47217f2eb65f490b9755f151b446904107cb9211 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -606,6 +606,14 @@ public abstract class PlayerList { diff --git a/patches/server/0647-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0646-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0647-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0646-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0648-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0647-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 91% rename from patches/server/0648-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0647-Don-t-ignore-result-of-PlayerEditBookEvent.patch index 656b00336..4cd6460a9 100644 --- a/patches/server/0648-Don-t-ignore-result-of-PlayerEditBookEvent.patch +++ b/patches/server/0647-Don-t-ignore-result-of-PlayerEditBookEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f6cd3c60f1d07b48ce953b1e2eb71121b3790730..435669e88d5b366531cef42df835e4d6e243f3c8 100644 +index 1a0ab16e1337867e982af8cd1a4e646b06c6e8d2..6a40ce317bd0e5a0043cd156d4c32de95d5d2827 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1191,7 +1191,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0649-Entity-load-save-limit-per-chunk.patch b/patches/server/0648-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0649-Entity-load-save-limit-per-chunk.patch rename to patches/server/0648-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0650-fix-cancelling-block-falling-causing-client-desync.patch b/patches/server/0649-fix-cancelling-block-falling-causing-client-desync.patch similarity index 100% rename from patches/server/0650-fix-cancelling-block-falling-causing-client-desync.patch rename to patches/server/0649-fix-cancelling-block-falling-causing-client-desync.patch diff --git a/patches/server/0651-Expose-protocol-version.patch b/patches/server/0650-Expose-protocol-version.patch similarity index 91% rename from patches/server/0651-Expose-protocol-version.patch rename to patches/server/0650-Expose-protocol-version.patch index b8b21715c..23a1e50c7 100644 --- a/patches/server/0651-Expose-protocol-version.patch +++ b/patches/server/0650-Expose-protocol-version.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose protocol version diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 63f998b4b3008854da66f78486e1d27172d9e0e0..3feebd181d0fb7ea5e08c38eb132efd2c4aac47e 100644 +index ca160d2b2899625c0df3c629e844673362954e26..13c57a457a33746ceb7d43ebac10df17f1a05315 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -484,6 +484,11 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0652-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0651-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch similarity index 98% rename from patches/server/0652-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch rename to patches/server/0651-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch index 1ca596317..2825a8de8 100644 --- a/patches/server/0652-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch +++ b/patches/server/0651-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Allow for Component suggestion tooltips in diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 435669e88d5b366531cef42df835e4d6e243f3c8..1f7ac37a1640d5fa4c93929e21bf8b84af136eea 100644 +index 6a40ce317bd0e5a0043cd156d4c32de95d5d2827..78ad9688a9acab75fb059f2a37528692faf71e86 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -758,12 +758,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0653-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0652-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0653-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0652-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0654-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0653-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0654-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0653-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0655-Add-bypass-host-check.patch b/patches/server/0654-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0655-Add-bypass-host-check.patch rename to patches/server/0654-Add-bypass-host-check.patch diff --git a/patches/server/0656-Set-area-affect-cloud-rotation.patch b/patches/server/0655-Set-area-affect-cloud-rotation.patch similarity index 92% rename from patches/server/0656-Set-area-affect-cloud-rotation.patch rename to patches/server/0655-Set-area-affect-cloud-rotation.patch index 886ca40da..889b4cd68 100644 --- a/patches/server/0656-Set-area-affect-cloud-rotation.patch +++ b/patches/server/0655-Set-area-affect-cloud-rotation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Set area affect cloud rotation diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index a1f0e15ac54a640dd5883288c0baa1d64fca239c..644d9fba74f394d71164b5c18835d08c7c30c305 100644 +index 7b1b64dfbac25e19bc97762fd6d8d8b09c6b5489..effe4d8c64c99d320d501187dce87d87ee9d3247 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1974,6 +1974,7 @@ public class CraftWorld implements World { diff --git a/patches/server/0657-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0656-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0657-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0656-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0658-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0657-Fix-duplicating-give-items-on-item-drop-cancel.patch similarity index 100% rename from patches/server/0658-Fix-duplicating-give-items-on-item-drop-cancel.patch rename to patches/server/0657-Fix-duplicating-give-items-on-item-drop-cancel.patch diff --git a/patches/server/0659-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0658-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0659-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0658-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0660-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0659-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0660-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0659-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0661-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0660-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0661-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0660-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0662-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0661-Fix-checkReach-check-for-Shulker-boxes.patch similarity index 100% rename from patches/server/0662-Fix-checkReach-check-for-Shulker-boxes.patch rename to patches/server/0661-Fix-checkReach-check-for-Shulker-boxes.patch diff --git a/patches/server/0663-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0662-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/0663-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0662-fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/0664-Added-PlayerDeepSleepEvent.patch b/patches/server/0663-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0664-Added-PlayerDeepSleepEvent.patch rename to patches/server/0663-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0665-More-World-API.patch b/patches/server/0664-More-World-API.patch similarity index 96% rename from patches/server/0665-More-World-API.patch rename to patches/server/0664-More-World-API.patch index dea21047f..202cb20c6 100644 --- a/patches/server/0665-More-World-API.patch +++ b/patches/server/0664-More-World-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] More World API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 644d9fba74f394d71164b5c18835d08c7c30c305..ba4d672da1cbd00c2653eed02b4854a7fddde2e2 100644 +index effe4d8c64c99d320d501187dce87d87ee9d3247..e4132642d4c72bc7697cb8796da7438c9da3d1d9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2533,6 +2533,75 @@ public class CraftWorld implements World { diff --git a/patches/server/0666-Added-PlayerBedFailEnterEvent.patch b/patches/server/0665-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0666-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0665-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0667-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0666-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0667-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0666-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0668-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0667-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 95% rename from patches/server/0668-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0667-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch index 6bc824910..51d8396de 100644 --- a/patches/server/0668-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch +++ b/patches/server/0667-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix anchor respawn acting as a bed respawn from the end diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 22529dec70914a8b2ffdb8a4677eca23ac754249..92181c6f3168317a01df0e27daec32f826ff1dee 100644 +index 47217f2eb65f490b9755f151b446904107cb9211..e11bdb3ee9512898dde4575633617658ac4bd951 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -841,6 +841,7 @@ public abstract class PlayerList { diff --git a/patches/server/0669-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0668-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0669-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0668-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0670-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0669-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/server/0670-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0669-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/server/0671-Add-Channel-initialization-listeners.patch b/patches/server/0670-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0671-Add-Channel-initialization-listeners.patch rename to patches/server/0670-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0672-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0671-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0672-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0671-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0673-Add-more-WanderingTrader-API.patch b/patches/server/0672-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0673-Add-more-WanderingTrader-API.patch rename to patches/server/0672-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0674-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0673-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0674-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0673-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0675-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0674-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 96% rename from patches/server/0675-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0674-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch index b63b7cfcd..35efeab74 100644 --- a/patches/server/0675-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch +++ b/patches/server/0674-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Adventure message to PlayerAdvancementDoneEvent diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java -index 77e262f2236318e053da136037332fbe6d8bf380..d1f85b092eba829b003e39c913a4afeffc140568 100644 +index e05e5710c81b7dbb648afbfe16f843e7ae310752..7d6dc0a8ee35274052b122bbc446bc54750de0a6 100644 --- a/src/main/java/net/minecraft/server/PlayerAdvancements.java +++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java @@ -290,10 +290,18 @@ public class PlayerAdvancements { diff --git a/patches/server/0676-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0675-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0676-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0675-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0677-Inventory-close.patch b/patches/server/0676-Inventory-close.patch similarity index 100% rename from patches/server/0677-Inventory-close.patch rename to patches/server/0676-Inventory-close.patch diff --git a/patches/server/0678-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0677-call-PortalCreateEvent-players-and-end-platform.patch similarity index 100% rename from patches/server/0678-call-PortalCreateEvent-players-and-end-platform.patch rename to patches/server/0677-call-PortalCreateEvent-players-and-end-platform.patch diff --git a/patches/server/0679-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0678-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0679-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0678-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0680-Fix-CraftPotionBrewer-cache.patch b/patches/server/0679-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0680-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0679-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0681-Add-basic-Datapack-API.patch b/patches/server/0680-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0681-Add-basic-Datapack-API.patch rename to patches/server/0680-Add-basic-Datapack-API.patch diff --git a/patches/server/0682-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0681-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0682-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0681-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0683-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0682-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/0683-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0682-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/server/0684-Clear-SyncLoadInfo.patch b/patches/server/0683-Clear-SyncLoadInfo.patch similarity index 95% rename from patches/server/0684-Clear-SyncLoadInfo.patch rename to patches/server/0683-Clear-SyncLoadInfo.patch index 18dc64939..f25dc4d1a 100644 --- a/patches/server/0684-Clear-SyncLoadInfo.patch +++ b/patches/server/0683-Clear-SyncLoadInfo.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Clear SyncLoadInfo This patch merely adds the extra argument "clear" after /paper syncloadinfo to clear currently stored syncload info. diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index 8fdfcf001cf2ed6184d86ee033ede08fdf9aa5d6..ce332be5449d3129356e55841cc319b3d35adde4 100644 +index 160f3cdee21d8a3aa2ed726a7fbfce460dff26f3..f8d282b962f2d63e0245797538f67391d47dab0f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -205,6 +205,13 @@ public class PaperCommand extends Command { diff --git a/patches/server/0685-ItemStack-repair-check-API.patch b/patches/server/0684-ItemStack-repair-check-API.patch similarity index 97% rename from patches/server/0685-ItemStack-repair-check-API.patch rename to patches/server/0684-ItemStack-repair-check-API.patch index dc7bbf8b2..9c063a37d 100644 --- a/patches/server/0685-ItemStack-repair-check-API.patch +++ b/patches/server/0684-ItemStack-repair-check-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack repair check API diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 3feebd181d0fb7ea5e08c38eb132efd2c4aac47e..47b14e0700dca279347e5a6b5252ceba2e6a6c72 100644 +index 13c57a457a33746ceb7d43ebac10df17f1a05315..917b14b338e151c5168a5f7e8a68eea206857500 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -485,6 +485,14 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0686-More-Enchantment-API.patch b/patches/server/0685-More-Enchantment-API.patch similarity index 100% rename from patches/server/0686-More-Enchantment-API.patch rename to patches/server/0685-More-Enchantment-API.patch diff --git a/patches/server/0687-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0686-Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 96% rename from patches/server/0687-Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/server/0686-Add-command-line-option-to-load-extra-plugin-jars-no.patch index eb4680837..b70500f9a 100644 --- a/patches/server/0687-Add-command-line-option-to-load-extra-plugin-jars-no.patch +++ b/patches/server/0686-Add-command-line-option-to-load-extra-plugin-jars-no.patch @@ -46,7 +46,7 @@ index b7db2d68deeee0a213ee26e31475f05ba16d073e..ca28dda0f9819e8d75fbaa48cf5ff564 if (type == PluginLoadOrder.STARTUP) { this.helpMap.clear(); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 6ebd0f6053929beb246993b5a1b682b9971baf0b..ba01312f7615d0507c1bd1cd175588197f8d122e 100644 +index daa881823f9a0757211e4fece8ebd9225f8b41bb..32f82c60b680180b256edff127e5a6ded42fccf4 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -153,6 +153,12 @@ public class Main { diff --git a/patches/server/0688-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0687-Fix-and-optimise-world-force-upgrading.patch similarity index 99% rename from patches/server/0688-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0687-Fix-and-optimise-world-force-upgrading.patch index b5ce4bf85..2f1a0edd9 100644 --- a/patches/server/0688-Fix-and-optimise-world-force-upgrading.patch +++ b/patches/server/0687-Fix-and-optimise-world-force-upgrading.patch @@ -263,7 +263,7 @@ index cf0a74b8a1c31d4bc493eb09a69ee2bd94cb6485..6fa1a7da70896d0ff34d38698769195a Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, worlds, eraseCache); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6f68e45bdb01605a93af1a4117743c6b0ee26056..f9e15a804388e2aeff8b45d7fba151651438f1c6 100644 +index 6003dff25e78395a92ab279f1a93f016f4a79c56..9feb9e64e64e19d99f6ba01e203b81f13235d12d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -563,13 +563,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop