diff --git a/patches/server/0108-Auto-fix-bad-Y-levels-on-player-login.patch b/patches/server/0108-Auto-fix-bad-Y-levels-on-player-login.patch deleted file mode 100644 index 838d335d3..000000000 --- a/patches/server/0108-Auto-fix-bad-Y-levels-on-player-login.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Wed, 21 Sep 2016 23:48:39 -0400 -Subject: [PATCH] Auto fix bad Y levels on player login - -Bring down to a saner Y level if super high, as this can cause the server to crash - -diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 7e7bbb6817ceddbbb90c1ac45d8e974d3f95c089..fe19a883cbf646442da19ca7380e3ecf05fadc2f 100644 ---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java -+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -397,6 +397,7 @@ public class ServerPlayer extends Player { - @Override - public void readAdditionalSaveData(CompoundTag nbt) { - super.readAdditionalSaveData(nbt); -+ if (this.getY() > 300) this.setPosRaw(getX(), 257, getZ()); // Paper - bring down to a saner Y level if out of world - if (nbt.contains("enteredNetherPosition", 10)) { - CompoundTag nbttagcompound1 = nbt.getCompound("enteredNetherPosition"); - diff --git a/patches/server/0109-Option-to-remove-corrupt-tile-entities.patch b/patches/server/0108-Option-to-remove-corrupt-tile-entities.patch similarity index 100% rename from patches/server/0109-Option-to-remove-corrupt-tile-entities.patch rename to patches/server/0108-Option-to-remove-corrupt-tile-entities.patch diff --git a/patches/server/0110-Add-EntityZapEvent.patch b/patches/server/0109-Add-EntityZapEvent.patch similarity index 100% rename from patches/server/0110-Add-EntityZapEvent.patch rename to patches/server/0109-Add-EntityZapEvent.patch diff --git a/patches/server/0111-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/patches/server/0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch similarity index 100% rename from patches/server/0111-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch rename to patches/server/0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch diff --git a/patches/server/0112-Cache-user-authenticator-threads.patch b/patches/server/0111-Cache-user-authenticator-threads.patch similarity index 100% rename from patches/server/0112-Cache-user-authenticator-threads.patch rename to patches/server/0111-Cache-user-authenticator-threads.patch diff --git a/patches/server/0113-Allow-Reloading-of-Command-Aliases.patch b/patches/server/0112-Allow-Reloading-of-Command-Aliases.patch similarity index 100% rename from patches/server/0113-Allow-Reloading-of-Command-Aliases.patch rename to patches/server/0112-Allow-Reloading-of-Command-Aliases.patch diff --git a/patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch b/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch similarity index 96% rename from patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch rename to patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch index 86c3cc52d..fee0293c8 100644 --- a/patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch +++ b/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add source to PlayerExpChangeEvent diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java -index 8b8181cfdd8d826dd132eb9475f6ff8e04afa465..4000480a14d2ba52149f4fa47f824abfa2e0e5f8 100644 +index b902bca6135c3a7be4804a441bbf8f73b4596432..41556294841b2c280ba4eff861405ccb6aee19e5 100644 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java @@ -246,7 +246,7 @@ public class ExperienceOrb extends Entity { diff --git a/patches/server/0115-Don-t-let-fishinghooks-use-portals.patch b/patches/server/0114-Don-t-let-fishinghooks-use-portals.patch similarity index 100% rename from patches/server/0115-Don-t-let-fishinghooks-use-portals.patch rename to patches/server/0114-Don-t-let-fishinghooks-use-portals.patch diff --git a/patches/server/0116-Add-ProjectileCollideEvent.patch b/patches/server/0115-Add-ProjectileCollideEvent.patch similarity index 100% rename from patches/server/0116-Add-ProjectileCollideEvent.patch rename to patches/server/0115-Add-ProjectileCollideEvent.patch diff --git a/patches/server/0117-Prevent-Pathfinding-out-of-World-Border.patch b/patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch similarity index 100% rename from patches/server/0117-Prevent-Pathfinding-out-of-World-Border.patch rename to patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch diff --git a/patches/server/0118-Optimize-World.isLoaded-BlockPosition-Z.patch b/patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch similarity index 100% rename from patches/server/0118-Optimize-World.isLoaded-BlockPosition-Z.patch rename to patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch diff --git a/patches/server/0119-Bound-Treasure-Maps-to-World-Border.patch b/patches/server/0118-Bound-Treasure-Maps-to-World-Border.patch similarity index 100% rename from patches/server/0119-Bound-Treasure-Maps-to-World-Border.patch rename to patches/server/0118-Bound-Treasure-Maps-to-World-Border.patch diff --git a/patches/server/0120-Configurable-Cartographer-Treasure-Maps.patch b/patches/server/0119-Configurable-Cartographer-Treasure-Maps.patch similarity index 100% rename from patches/server/0120-Configurable-Cartographer-Treasure-Maps.patch rename to patches/server/0119-Configurable-Cartographer-Treasure-Maps.patch diff --git a/patches/server/0121-Optimize-ItemStack.isEmpty.patch b/patches/server/0120-Optimize-ItemStack.isEmpty.patch similarity index 100% rename from patches/server/0121-Optimize-ItemStack.isEmpty.patch rename to patches/server/0120-Optimize-ItemStack.isEmpty.patch diff --git a/patches/server/0122-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch similarity index 100% rename from patches/server/0122-Add-API-methods-to-control-if-armour-stands-can-move.patch rename to patches/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch diff --git a/patches/server/0123-String-based-Action-Bar-API.patch b/patches/server/0122-String-based-Action-Bar-API.patch similarity index 100% rename from patches/server/0123-String-based-Action-Bar-API.patch rename to patches/server/0122-String-based-Action-Bar-API.patch diff --git a/patches/server/0124-Properly-fix-item-duplication-bug.patch b/patches/server/0123-Properly-fix-item-duplication-bug.patch similarity index 90% rename from patches/server/0124-Properly-fix-item-duplication-bug.patch rename to patches/server/0123-Properly-fix-item-duplication-bug.patch index 7adf4f381..f76a42965 100644 --- a/patches/server/0124-Properly-fix-item-duplication-bug.patch +++ b/patches/server/0123-Properly-fix-item-duplication-bug.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Properly fix item duplication bug Credit to prplz for figuring out the real issue diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index fe19a883cbf646442da19ca7380e3ecf05fadc2f..e5bafb77d26a95fab4b0f7a419fc09f885821c0d 100644 +index 7e7bbb6817ceddbbb90c1ac45d8e974d3f95c089..d4614faa22485dce226f3dc17ef984212ac8fcb9 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2129,7 +2129,7 @@ public class ServerPlayer extends Player { +@@ -2128,7 +2128,7 @@ public class ServerPlayer extends Player { @Override public boolean isImmobile() { diff --git a/patches/server/0125-Firework-API-s.patch b/patches/server/0124-Firework-API-s.patch similarity index 100% rename from patches/server/0125-Firework-API-s.patch rename to patches/server/0124-Firework-API-s.patch diff --git a/patches/server/0126-PlayerTeleportEndGatewayEvent.patch b/patches/server/0125-PlayerTeleportEndGatewayEvent.patch similarity index 100% rename from patches/server/0126-PlayerTeleportEndGatewayEvent.patch rename to patches/server/0125-PlayerTeleportEndGatewayEvent.patch diff --git a/patches/server/0127-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch similarity index 100% rename from patches/server/0127-Provide-E-TE-Chunk-count-stat-methods.patch rename to patches/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch diff --git a/patches/server/0128-Enforce-Sync-Player-Saves.patch b/patches/server/0127-Enforce-Sync-Player-Saves.patch similarity index 100% rename from patches/server/0128-Enforce-Sync-Player-Saves.patch rename to patches/server/0127-Enforce-Sync-Player-Saves.patch diff --git a/patches/server/0129-Don-t-allow-entities-to-ride-themselves-572.patch b/patches/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch similarity index 100% rename from patches/server/0129-Don-t-allow-entities-to-ride-themselves-572.patch rename to patches/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch diff --git a/patches/server/0130-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch similarity index 99% rename from patches/server/0130-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch rename to patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index 620f6c05c..efff1dae6 100644 --- a/patches/server/0130-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -21,7 +21,7 @@ index f772924217c0531b09662a145d8ee5d22dd5ca51..ecfb88b4d9727ad20a2c33475cc6b1ec return true; diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java -index 4000480a14d2ba52149f4fa47f824abfa2e0e5f8..ea01f84448693ca740b5f3381a9c500e5aa3914e 100644 +index 41556294841b2c280ba4eff861405ccb6aee19e5..5220e3ee9fab4c4cbc95e0cf1928392316a35e34 100644 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java @@ -38,13 +38,63 @@ public class ExperienceOrb extends Entity { diff --git a/patches/server/0131-Cap-Entity-Collisions.patch b/patches/server/0130-Cap-Entity-Collisions.patch similarity index 100% rename from patches/server/0131-Cap-Entity-Collisions.patch rename to patches/server/0130-Cap-Entity-Collisions.patch diff --git a/patches/server/0132-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch similarity index 100% rename from patches/server/0132-Remove-CraftScheduler-Async-Task-Debugger.patch rename to patches/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch diff --git a/patches/server/0133-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/patches/server/0132-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch similarity index 100% rename from patches/server/0133-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch rename to patches/server/0132-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch diff --git a/patches/server/0134-Do-not-let-armorstands-drown.patch b/patches/server/0133-Do-not-let-armorstands-drown.patch similarity index 100% rename from patches/server/0134-Do-not-let-armorstands-drown.patch rename to patches/server/0133-Do-not-let-armorstands-drown.patch diff --git a/patches/server/0135-Properly-handle-async-calls-to-restart-the-server.patch b/patches/server/0134-Properly-handle-async-calls-to-restart-the-server.patch similarity index 100% rename from patches/server/0135-Properly-handle-async-calls-to-restart-the-server.patch rename to patches/server/0134-Properly-handle-async-calls-to-restart-the-server.patch 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 100% 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 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 100% rename from patches/server/0138-Use-TerminalConsoleAppender-for-console-improvements.patch rename to patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch 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 100% rename from patches/server/0140-Item-canEntityPickup.patch rename to patches/server/0139-Item-canEntityPickup.patch 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 100% rename from patches/server/0144-Basic-PlayerProfile-API.patch rename to patches/server/0143-Basic-PlayerProfile-API.patch 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 100% rename from patches/server/0158-Handle-plugin-prefixes-using-Log4J-configuration.patch rename to patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch 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 100% rename from patches/server/0160-Add-PlayerJumpEvent.patch rename to patches/server/0159-Add-PlayerJumpEvent.patch diff --git a/patches/server/0161-handle-PacketPlayInKeepAlive-async.patch b/patches/server/0160-handle-PacketPlayInKeepAlive-async.patch similarity index 100% rename from patches/server/0161-handle-PacketPlayInKeepAlive-async.patch rename to patches/server/0160-handle-PacketPlayInKeepAlive-async.patch 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 100% 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 diff --git a/patches/server/0163-revert-serverside-behavior-of-keepalives.patch b/patches/server/0162-revert-serverside-behavior-of-keepalives.patch similarity index 100% rename from patches/server/0163-revert-serverside-behavior-of-keepalives.patch rename to patches/server/0162-revert-serverside-behavior-of-keepalives.patch 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 100% 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 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 100% rename from patches/server/0170-AsyncTabCompleteEvent.patch rename to patches/server/0169-AsyncTabCompleteEvent.patch 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 fd88666ba..2121564c8 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 ea01f84448693ca740b5f3381a9c500e5aa3914e..707380c41df3a5783953ee0b6fe81b55fc7ed3cd 100644 +index 5220e3ee9fab4c4cbc95e0cf1928392316a35e34..1fdfeaa7758497e93fc13b44996e11d74a812546 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 97% rename from patches/server/0174-PlayerNaturallySpawnCreaturesEvent.patch rename to patches/server/0173-PlayerNaturallySpawnCreaturesEvent.patch index 5e6955b25..a0dabf994 100644 --- a/patches/server/0174-PlayerNaturallySpawnCreaturesEvent.patch +++ b/patches/server/0173-PlayerNaturallySpawnCreaturesEvent.patch @@ -56,7 +56,7 @@ index 3e2a5f83afcc3b9c9fe62748895d489135af03bf..dd61048b3898ef3ea5a2bd2f95e9bd3f list.forEach((playerchunk) -> { Optional optional = ((Either) playerchunk.getTickingChunkFuture().getNow(ChunkHolder.UNLOADED_LEVEL_CHUNK)).left(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index e5bafb77d26a95fab4b0f7a419fc09f885821c0d..3a3f04cc3aaaebc1df8eace740ca29203bd6d871 100644 +index d4614faa22485dce226f3dc17ef984212ac8fcb9..66434418fae67ff63450bc246796c7f3d4d09ae6 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1,5 +1,6 @@ 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 100% rename from patches/server/0184-Implement-extended-PaperServerListPingEvent.patch rename to patches/server/0183-Implement-extended-PaperServerListPingEvent.patch 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 100% rename from patches/server/0187-Player.setPlayerProfile-API.patch rename to patches/server/0186-Player.setPlayerProfile-API.patch 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-Upstream-config-migrations.patch b/patches/server/0188-Upstream-config-migrations.patch similarity index 100% rename from patches/server/0189-Upstream-config-migrations.patch rename to patches/server/0188-Upstream-config-migrations.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 100% rename from patches/server/0192-Flag-to-disable-the-channel-limit.patch rename to patches/server/0191-Flag-to-disable-the-channel-limit.patch 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 100% 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 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 100% 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 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 100% rename from patches/server/0215-Implement-EntityKnockbackByEntityEvent.patch rename to patches/server/0214-Implement-EntityKnockbackByEntityEvent.patch 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 3bee9ad45..0ff59740c 100644 --- a/patches/server/0221-InventoryCloseEvent-Reason-API.patch +++ b/patches/server/0220-InventoryCloseEvent-Reason-API.patch @@ -29,10 +29,10 @@ index 86a5a4456be65b94b0c27a0355c3844cbd296a20..c4aa14e81151ada49e61f4dd25267f7e } // Spigot End diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 3a3f04cc3aaaebc1df8eace740ca29203bd6d871..2ecbe2c21fd9beaf4ce4f1b3531acb1036f3dfaa 100644 +index 66434418fae67ff63450bc246796c7f3d4d09ae6..b34f9c039a3ac198ae450794b5486d5197d2cfea 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -598,7 +598,7 @@ public class ServerPlayer extends Player { +@@ -597,7 +597,7 @@ public class ServerPlayer extends Player { } // Paper end if (!this.level.isClientSide && !this.containerMenu.stillValid(this)) { @@ -41,7 +41,7 @@ index 3a3f04cc3aaaebc1df8eace740ca29203bd6d871..2ecbe2c21fd9beaf4ce4f1b3531acb10 this.containerMenu = this.inventoryMenu; } -@@ -752,7 +752,7 @@ public class ServerPlayer extends Player { +@@ -751,7 +751,7 @@ public class ServerPlayer extends Player { // SPIGOT-943 - only call if they have an inventory open if (this.containerMenu != this.inventoryMenu) { @@ -50,7 +50,7 @@ index 3a3f04cc3aaaebc1df8eace740ca29203bd6d871..2ecbe2c21fd9beaf4ce4f1b3531acb10 } net.kyori.adventure.text.Component deathMessage = event.deathMessage() != null ? event.deathMessage() : net.kyori.adventure.text.Component.empty(); // Paper - Adventure -@@ -1403,7 +1403,7 @@ public class ServerPlayer extends Player { +@@ -1402,7 +1402,7 @@ public class ServerPlayer extends Player { } // CraftBukkit end if (this.containerMenu != this.inventoryMenu) { @@ -59,7 +59,7 @@ index 3a3f04cc3aaaebc1df8eace740ca29203bd6d871..2ecbe2c21fd9beaf4ce4f1b3531acb10 } // this.nextContainerCounter(); // CraftBukkit - moved up -@@ -1432,7 +1432,13 @@ public class ServerPlayer extends Player { +@@ -1431,7 +1431,13 @@ public class ServerPlayer extends Player { @Override public void closeContainer() { 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 100% rename from patches/server/0223-Refresh-player-inventory-when-cancelling-PlayerInter.patch rename to patches/server/0222-Refresh-player-inventory-when-cancelling-PlayerInter.patch 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-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0224-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch similarity index 100% rename from patches/server/0225-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch rename to patches/server/0224-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch 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 100% rename from patches/server/0226-add-more-information-to-Entity.toString.patch rename to patches/server/0225-add-more-information-to-Entity.toString.patch 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 96% rename from patches/server/0231-Improve-BlockPosition-inlining.patch rename to patches/server/0230-Improve-BlockPosition-inlining.patch index 0ba1d63f0..ac4eb44c6 100644 --- a/patches/server/0231-Improve-BlockPosition-inlining.patch +++ b/patches/server/0230-Improve-BlockPosition-inlining.patch @@ -21,7 +21,7 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt They had 'callq' (invoke) instead of 'mov' (get from memory) instructions. diff --git a/src/main/java/net/minecraft/core/Vec3i.java b/src/main/java/net/minecraft/core/Vec3i.java -index e188f130e47ef319477050981de53a7410452592..5e09890ba2fe326503a49b2dbec09845f5c8c5eb 100644 +index f924f2b20800dfde93eeafea3614203661d35389..dc7598a011c2b290a42df35593de0b6689c99c57 100644 --- a/src/main/java/net/minecraft/core/Vec3i.java +++ b/src/main/java/net/minecraft/core/Vec3i.java @@ -41,7 +41,7 @@ public class Vec3i implements Comparable { 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 100% 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 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 100% rename from patches/server/0234-Vanished-players-don-t-have-rights.patch rename to patches/server/0233-Vanished-players-don-t-have-rights.patch 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 100% rename from patches/server/0240-Add-hand-to-bucket-events.patch rename to patches/server/0239-Add-hand-to-bucket-events.patch 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 100% 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 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 5b7f665cb..f21e8609c 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 707380c41df3a5783953ee0b6fe81b55fc7ed3cd..1caf10ecf949e0f465ffe573f3bed1a3c5733a7f 100644 +index 1fdfeaa7758497e93fc13b44996e11d74a812546..ec7d011fa5df0b4775bedc01632ba549d3803693 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 100% 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 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 100% rename from patches/server/0246-Add-Early-Warning-Feature-to-WatchDog.patch rename to patches/server/0245-Add-Early-Warning-Feature-to-WatchDog.patch diff --git a/patches/server/0247-Make-EnderDragon-implement-Mob.patch b/patches/server/0246-Make-EnderDragon-implement-Mob.patch similarity index 100% rename from patches/server/0247-Make-EnderDragon-implement-Mob.patch rename to patches/server/0246-Make-EnderDragon-implement-Mob.patch diff --git a/patches/server/0248-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0247-Use-ConcurrentHashMap-in-JsonList.patch similarity index 100% rename from patches/server/0248-Use-ConcurrentHashMap-in-JsonList.patch rename to patches/server/0247-Use-ConcurrentHashMap-in-JsonList.patch diff --git a/patches/server/0249-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0248-Use-a-Queue-for-Queueing-Commands.patch similarity index 100% rename from patches/server/0249-Use-a-Queue-for-Queueing-Commands.patch rename to patches/server/0248-Use-a-Queue-for-Queueing-Commands.patch diff --git a/patches/server/0250-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/server/0249-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch similarity index 100% rename from patches/server/0250-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch rename to patches/server/0249-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch diff --git a/patches/server/0251-Optimize-BlockPosition-helper-methods.patch b/patches/server/0250-Optimize-BlockPosition-helper-methods.patch similarity index 100% rename from patches/server/0251-Optimize-BlockPosition-helper-methods.patch rename to patches/server/0250-Optimize-BlockPosition-helper-methods.patch diff --git a/patches/server/0252-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch b/patches/server/0251-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch similarity index 100% rename from patches/server/0252-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch rename to patches/server/0251-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch diff --git a/patches/server/0253-Slime-Pathfinder-Events.patch b/patches/server/0252-Slime-Pathfinder-Events.patch similarity index 100% rename from patches/server/0253-Slime-Pathfinder-Events.patch rename to patches/server/0252-Slime-Pathfinder-Events.patch diff --git a/patches/server/0254-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0253-Configurable-speed-for-water-flowing-over-lava.patch similarity index 100% rename from patches/server/0254-Configurable-speed-for-water-flowing-over-lava.patch rename to patches/server/0253-Configurable-speed-for-water-flowing-over-lava.patch diff --git a/patches/server/0255-Optimize-CraftBlockData-Creation.patch b/patches/server/0254-Optimize-CraftBlockData-Creation.patch similarity index 100% rename from patches/server/0255-Optimize-CraftBlockData-Creation.patch rename to patches/server/0254-Optimize-CraftBlockData-Creation.patch diff --git a/patches/server/0256-Optimize-MappedRegistry.patch b/patches/server/0255-Optimize-MappedRegistry.patch similarity index 100% rename from patches/server/0256-Optimize-MappedRegistry.patch rename to patches/server/0255-Optimize-MappedRegistry.patch diff --git a/patches/server/0257-Add-PhantomPreSpawnEvent.patch b/patches/server/0256-Add-PhantomPreSpawnEvent.patch similarity index 100% rename from patches/server/0257-Add-PhantomPreSpawnEvent.patch rename to patches/server/0256-Add-PhantomPreSpawnEvent.patch diff --git a/patches/server/0258-Add-More-Creeper-API.patch b/patches/server/0257-Add-More-Creeper-API.patch similarity index 100% rename from patches/server/0258-Add-More-Creeper-API.patch rename to patches/server/0257-Add-More-Creeper-API.patch diff --git a/patches/server/0259-Inventory-removeItemAnySlot.patch b/patches/server/0258-Inventory-removeItemAnySlot.patch similarity index 100% rename from patches/server/0259-Inventory-removeItemAnySlot.patch rename to patches/server/0258-Inventory-removeItemAnySlot.patch diff --git a/patches/server/0260-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0259-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch similarity index 100% rename from patches/server/0260-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch rename to patches/server/0259-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch diff --git a/patches/server/0261-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0260-Asynchronous-chunk-IO-and-loading.patch similarity index 100% rename from patches/server/0261-Asynchronous-chunk-IO-and-loading.patch rename to patches/server/0260-Asynchronous-chunk-IO-and-loading.patch diff --git a/patches/server/0262-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0261-Add-ray-tracing-methods-to-LivingEntity.patch similarity index 100% rename from patches/server/0262-Add-ray-tracing-methods-to-LivingEntity.patch rename to patches/server/0261-Add-ray-tracing-methods-to-LivingEntity.patch diff --git a/patches/server/0263-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0262-Expose-attack-cooldown-methods-for-Player.patch similarity index 100% rename from patches/server/0263-Expose-attack-cooldown-methods-for-Player.patch rename to patches/server/0262-Expose-attack-cooldown-methods-for-Player.patch diff --git a/patches/server/0264-Improve-death-events.patch b/patches/server/0263-Improve-death-events.patch similarity index 98% rename from patches/server/0264-Improve-death-events.patch rename to patches/server/0263-Improve-death-events.patch index 01a9a68b0..016c9e317 100644 --- a/patches/server/0264-Improve-death-events.patch +++ b/patches/server/0263-Improve-death-events.patch @@ -19,7 +19,7 @@ maybe more (please check patch overrides for drops for more): - players, armor stands, foxes, chested donkeys/llamas diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 2ecbe2c21fd9beaf4ce4f1b3531acb1036f3dfaa..d5670af087fbcc9ebc18d4779373487b704cf810 100644 +index b34f9c039a3ac198ae450794b5486d5197d2cfea..4cfbb920abad262d42553270455f0cd09dbdcb1a 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -219,6 +219,10 @@ public class ServerPlayer extends Player { @@ -33,7 +33,7 @@ index 2ecbe2c21fd9beaf4ce4f1b3531acb1036f3dfaa..d5670af087fbcc9ebc18d4779373487b // CraftBukkit start public String displayName; -@@ -749,6 +753,15 @@ public class ServerPlayer extends Player { +@@ -748,6 +752,15 @@ public class ServerPlayer extends Player { String deathmessage = defaultMessage.getString(); this.keepLevel = keepInventory; // SPIGOT-2222: pre-set keepLevel org.bukkit.event.entity.PlayerDeathEvent event = CraftEventFactory.callPlayerDeathEvent(this, loot, PaperAdventure.asAdventure(defaultMessage), defaultMessage.getString(), keepInventory); // Paper - Adventure @@ -49,7 +49,7 @@ index 2ecbe2c21fd9beaf4ce4f1b3531acb1036f3dfaa..d5670af087fbcc9ebc18d4779373487b // SPIGOT-943 - only call if they have an inventory open if (this.containerMenu != this.inventoryMenu) { -@@ -896,8 +909,17 @@ public class ServerPlayer extends Player { +@@ -895,8 +908,17 @@ public class ServerPlayer extends Player { } } } diff --git a/patches/server/0265-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0264-Allow-chests-to-be-placed-with-NBT-data.patch similarity index 100% rename from patches/server/0265-Allow-chests-to-be-placed-with-NBT-data.patch rename to patches/server/0264-Allow-chests-to-be-placed-with-NBT-data.patch diff --git a/patches/server/0266-Mob-Pathfinding-API.patch b/patches/server/0265-Mob-Pathfinding-API.patch similarity index 100% rename from patches/server/0266-Mob-Pathfinding-API.patch rename to patches/server/0265-Mob-Pathfinding-API.patch diff --git a/patches/server/0267-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0266-Prevent-chunk-loading-from-Fluid-Flowing.patch similarity index 100% rename from patches/server/0267-Prevent-chunk-loading-from-Fluid-Flowing.patch rename to patches/server/0266-Prevent-chunk-loading-from-Fluid-Flowing.patch diff --git a/patches/server/0268-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0267-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch similarity index 100% rename from patches/server/0268-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch rename to patches/server/0267-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch diff --git a/patches/server/0269-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0268-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch similarity index 100% rename from patches/server/0269-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch rename to patches/server/0268-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch diff --git a/patches/server/0270-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0269-Prevent-mob-spawning-from-loading-generating-chunks.patch similarity index 100% rename from patches/server/0270-Prevent-mob-spawning-from-loading-generating-chunks.patch rename to patches/server/0269-Prevent-mob-spawning-from-loading-generating-chunks.patch diff --git a/patches/server/0271-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0270-Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/server/0271-Implement-furnace-cook-speed-multiplier-API.patch rename to patches/server/0270-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/server/0272-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0271-Catch-JsonParseException-in-Entity-and-TE-names.patch similarity index 100% rename from patches/server/0272-Catch-JsonParseException-in-Entity-and-TE-names.patch rename to patches/server/0271-Catch-JsonParseException-in-Entity-and-TE-names.patch diff --git a/patches/server/0273-Honor-EntityAgeable.ageLock.patch b/patches/server/0272-Honor-EntityAgeable.ageLock.patch similarity index 100% rename from patches/server/0273-Honor-EntityAgeable.ageLock.patch rename to patches/server/0272-Honor-EntityAgeable.ageLock.patch diff --git a/patches/server/0274-Configurable-connection-throttle-kick-message.patch b/patches/server/0273-Configurable-connection-throttle-kick-message.patch similarity index 100% rename from patches/server/0274-Configurable-connection-throttle-kick-message.patch rename to patches/server/0273-Configurable-connection-throttle-kick-message.patch diff --git a/patches/server/0275-Hook-into-CB-plugin-rewrites.patch b/patches/server/0274-Hook-into-CB-plugin-rewrites.patch similarity index 100% rename from patches/server/0275-Hook-into-CB-plugin-rewrites.patch rename to patches/server/0274-Hook-into-CB-plugin-rewrites.patch diff --git a/patches/server/0276-Add-sun-related-API.patch b/patches/server/0275-Add-sun-related-API.patch similarity index 100% rename from patches/server/0276-Add-sun-related-API.patch rename to patches/server/0275-Add-sun-related-API.patch diff --git a/patches/server/0277-Add-LivingEntity-getTargetEntity.patch b/patches/server/0276-Add-LivingEntity-getTargetEntity.patch similarity index 100% rename from patches/server/0277-Add-LivingEntity-getTargetEntity.patch rename to patches/server/0276-Add-LivingEntity-getTargetEntity.patch diff --git a/patches/server/0278-Turtle-API.patch b/patches/server/0277-Turtle-API.patch similarity index 100% rename from patches/server/0278-Turtle-API.patch rename to patches/server/0277-Turtle-API.patch diff --git a/patches/server/0279-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/server/0278-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch similarity index 100% rename from patches/server/0279-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch rename to patches/server/0278-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch diff --git a/patches/server/0280-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0279-Call-player-spectator-target-events-and-improve-impl.patch similarity index 96% rename from patches/server/0280-Call-player-spectator-target-events-and-improve-impl.patch rename to patches/server/0279-Call-player-spectator-target-events-and-improve-impl.patch index f67c4ec80..982fcef98 100644 --- a/patches/server/0280-Call-player-spectator-target-events-and-improve-impl.patch +++ b/patches/server/0279-Call-player-spectator-target-events-and-improve-impl.patch @@ -19,10 +19,10 @@ spectate the target entity. Co-authored-by: Spottedleaf diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index d5670af087fbcc9ebc18d4779373487b704cf810..529d4ec405c76ed2fce5d147d41251513d5293f2 100644 +index 4cfbb920abad262d42553270455f0cd09dbdcb1a..c4f433832dc439830fc1584d36a197066fdb3e75 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1824,14 +1824,58 @@ public class ServerPlayer extends Player { +@@ -1823,14 +1823,58 @@ public class ServerPlayer extends Player { } public void setCamera(Entity entity) { diff --git a/patches/server/0281-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0280-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/0281-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0280-Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/0282-Add-more-Witch-API.patch b/patches/server/0281-Add-more-Witch-API.patch similarity index 100% rename from patches/server/0282-Add-more-Witch-API.patch rename to patches/server/0281-Add-more-Witch-API.patch diff --git a/patches/server/0283-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0282-Check-Drowned-for-Villager-Aggression-Config.patch similarity index 100% rename from patches/server/0283-Check-Drowned-for-Villager-Aggression-Config.patch rename to patches/server/0282-Check-Drowned-for-Villager-Aggression-Config.patch diff --git a/patches/server/0284-Here-s-Johnny.patch b/patches/server/0283-Here-s-Johnny.patch similarity index 100% rename from patches/server/0284-Here-s-Johnny.patch rename to patches/server/0283-Here-s-Johnny.patch diff --git a/patches/server/0285-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0284-Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 100% rename from patches/server/0285-Add-option-to-prevent-players-from-moving-into-unloa.patch rename to patches/server/0284-Add-option-to-prevent-players-from-moving-into-unloa.patch diff --git a/patches/server/0286-Reset-players-airTicks-on-respawn.patch b/patches/server/0285-Reset-players-airTicks-on-respawn.patch similarity index 83% rename from patches/server/0286-Reset-players-airTicks-on-respawn.patch rename to patches/server/0285-Reset-players-airTicks-on-respawn.patch index fa71da12e..9e80e607c 100644 --- a/patches/server/0286-Reset-players-airTicks-on-respawn.patch +++ b/patches/server/0285-Reset-players-airTicks-on-respawn.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Reset players airTicks on respawn diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 529d4ec405c76ed2fce5d147d41251513d5293f2..0dd1762782837e905fbc405d95ef6e1dcd9b39b4 100644 +index c4f433832dc439830fc1584d36a197066fdb3e75..d32e6feca6c39a28f80574e4b080ddd4cbb60fdc 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2223,6 +2223,7 @@ public class ServerPlayer extends Player { +@@ -2222,6 +2222,7 @@ public class ServerPlayer extends Player { this.setHealth(this.getMaxHealth()); this.stopUsingItem(); // CraftBukkit - SPIGOT-6682: Clear active item on reset diff --git a/patches/server/0287-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0286-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 100% rename from patches/server/0287-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to patches/server/0286-Don-t-sleep-after-profile-lookups-if-not-needed.patch diff --git a/patches/server/0288-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0287-Improve-Server-Thread-Pool-and-Thread-Priorities.patch similarity index 100% rename from patches/server/0288-Improve-Server-Thread-Pool-and-Thread-Priorities.patch rename to patches/server/0287-Improve-Server-Thread-Pool-and-Thread-Priorities.patch diff --git a/patches/server/0289-Optimize-World-Time-Updates.patch b/patches/server/0288-Optimize-World-Time-Updates.patch similarity index 100% rename from patches/server/0289-Optimize-World-Time-Updates.patch rename to patches/server/0288-Optimize-World-Time-Updates.patch diff --git a/patches/server/0290-Restore-custom-InventoryHolder-support.patch b/patches/server/0289-Restore-custom-InventoryHolder-support.patch similarity index 100% rename from patches/server/0290-Restore-custom-InventoryHolder-support.patch rename to patches/server/0289-Restore-custom-InventoryHolder-support.patch diff --git a/patches/server/0291-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0290-Use-Vanilla-Minecart-Speeds.patch similarity index 100% rename from patches/server/0291-Use-Vanilla-Minecart-Speeds.patch rename to patches/server/0290-Use-Vanilla-Minecart-Speeds.patch diff --git a/patches/server/0292-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0291-Fix-SpongeAbsortEvent-handling.patch similarity index 100% rename from patches/server/0292-Fix-SpongeAbsortEvent-handling.patch rename to patches/server/0291-Fix-SpongeAbsortEvent-handling.patch diff --git a/patches/server/0293-PreSpawnerSpawnEvent.patch b/patches/server/0292-PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/server/0293-PreSpawnerSpawnEvent.patch rename to patches/server/0292-PreSpawnerSpawnEvent.patch diff --git a/patches/server/0294-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0293-Don-t-allow-digging-into-unloaded-chunks.patch similarity index 96% rename from patches/server/0294-Don-t-allow-digging-into-unloaded-chunks.patch rename to patches/server/0293-Don-t-allow-digging-into-unloaded-chunks.patch index 8b0a6b20d..b7f1851d9 100644 --- a/patches/server/0294-Don-t-allow-digging-into-unloaded-chunks.patch +++ b/patches/server/0293-Don-t-allow-digging-into-unloaded-chunks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't allow digging into unloaded chunks diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 315dad4789f5f2582ee9b4fc176affd1f57537ef..8659df9d2e9d8b3b0cd992efc9a1f3b2d958e9c8 100644 +index 315dad4789f5f2582ee9b4fc176affd1f57537ef..6219634a57976a6a0a9b32ed08d56107d6b5d1c3 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -119,8 +119,8 @@ public class ServerPlayerGameMode { @@ -38,7 +38,7 @@ index 315dad4789f5f2582ee9b4fc176affd1f57537ef..8659df9d2e9d8b3b0cd992efc9a1f3b2 double d3 = d0 * d0 + d1 * d1 + d2 * d2; if (d3 > 36.0D) { -+ if (d3 < 80 * 80) // Paper - Don't notify if unreasonably far away ++ if (true) return; // Paper - Don't notify if unreasonably far away this.player.connection.send(new ClientboundBlockBreakAckPacket(pos, this.level.getBlockState(pos), action, false, "too far")); } else if (pos.getY() >= worldHeight) { this.player.connection.send(new ClientboundBlockBreakAckPacket(pos, this.level.getBlockState(pos), action, false, "too high")); diff --git a/patches/server/0295-Make-the-default-permission-message-configurable.patch b/patches/server/0294-Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/server/0295-Make-the-default-permission-message-configurable.patch rename to patches/server/0294-Make-the-default-permission-message-configurable.patch diff --git a/patches/server/0296-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0295-Prevent-rayTrace-from-loading-chunks.patch similarity index 100% rename from patches/server/0296-Prevent-rayTrace-from-loading-chunks.patch rename to patches/server/0295-Prevent-rayTrace-from-loading-chunks.patch diff --git a/patches/server/0297-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0296-Handle-Large-Packets-disconnecting-client.patch similarity index 100% rename from patches/server/0297-Handle-Large-Packets-disconnecting-client.patch rename to patches/server/0296-Handle-Large-Packets-disconnecting-client.patch diff --git a/patches/server/0298-force-entity-dismount-during-teleportation.patch b/patches/server/0297-force-entity-dismount-during-teleportation.patch similarity index 97% rename from patches/server/0298-force-entity-dismount-during-teleportation.patch rename to patches/server/0297-force-entity-dismount-during-teleportation.patch index ca564a9ad..ef8575af7 100644 --- a/patches/server/0298-force-entity-dismount-during-teleportation.patch +++ b/patches/server/0297-force-entity-dismount-during-teleportation.patch @@ -20,10 +20,10 @@ this is going to be the best soultion all around. Improvements/suggestions welcome! diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 0dd1762782837e905fbc405d95ef6e1dcd9b39b4..8167934aa9def31ef13f926c5b16ce075aebda18 100644 +index d32e6feca6c39a28f80574e4b080ddd4cbb60fdc..a0530081a1d4bf2b46d82f15013dd3d8d289ee47 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1297,11 +1297,13 @@ public class ServerPlayer extends Player { +@@ -1296,11 +1296,13 @@ public class ServerPlayer extends Player { } } diff --git a/patches/server/0299-Add-more-Zombie-API.patch b/patches/server/0298-Add-more-Zombie-API.patch similarity index 100% rename from patches/server/0299-Add-more-Zombie-API.patch rename to patches/server/0298-Add-more-Zombie-API.patch diff --git a/patches/server/0300-Book-Size-Limits.patch b/patches/server/0299-Book-Size-Limits.patch similarity index 100% rename from patches/server/0300-Book-Size-Limits.patch rename to patches/server/0299-Book-Size-Limits.patch diff --git a/patches/server/0301-Add-PlayerConnectionCloseEvent.patch b/patches/server/0300-Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/server/0301-Add-PlayerConnectionCloseEvent.patch rename to patches/server/0300-Add-PlayerConnectionCloseEvent.patch diff --git a/patches/server/0302-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0301-Prevent-Enderman-from-loading-chunks.patch similarity index 100% rename from patches/server/0302-Prevent-Enderman-from-loading-chunks.patch rename to patches/server/0301-Prevent-Enderman-from-loading-chunks.patch diff --git a/patches/server/0303-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0302-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 98% rename from patches/server/0303-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to patches/server/0302-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index e3bb0efd7..215c97d0d 100644 --- a/patches/server/0303-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/patches/server/0302-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and documented as to their purpose. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 8167934aa9def31ef13f926c5b16ce075aebda18..3e68a98dafb89a6a80b5b432cd1262ad1db01582 100644 +index a0530081a1d4bf2b46d82f15013dd3d8d289ee47..b3af35120834a907ca05aa98f43d5b4be7f2248d 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -219,6 +219,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0304-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0303-Workaround-for-vehicle-tracking-issue-on-disconnect.patch similarity index 85% rename from patches/server/0304-Workaround-for-vehicle-tracking-issue-on-disconnect.patch rename to patches/server/0303-Workaround-for-vehicle-tracking-issue-on-disconnect.patch index d0480a6c3..51d3596b5 100644 --- a/patches/server/0304-Workaround-for-vehicle-tracking-issue-on-disconnect.patch +++ b/patches/server/0303-Workaround-for-vehicle-tracking-issue-on-disconnect.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Workaround for vehicle tracking issue on disconnect diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 3e68a98dafb89a6a80b5b432cd1262ad1db01582..a342fe47deb46e69f14d20029af8d94e11726e57 100644 +index b3af35120834a907ca05aa98f43d5b4be7f2248d..6d723445f80fc6db5880f658098046de5f13f563 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1540,6 +1540,13 @@ public class ServerPlayer extends Player { +@@ -1539,6 +1539,13 @@ public class ServerPlayer extends Player { public void disconnect() { this.disconnected = true; this.ejectPassengers(); diff --git a/patches/server/0305-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/patches/server/0304-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch similarity index 100% rename from patches/server/0305-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch rename to patches/server/0304-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch diff --git a/patches/server/0306-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0305-Block-Entity-remove-from-being-called-on-Players.patch similarity index 100% rename from patches/server/0306-Block-Entity-remove-from-being-called-on-Players.patch rename to patches/server/0305-Block-Entity-remove-from-being-called-on-Players.patch diff --git a/patches/server/0307-BlockDestroyEvent.patch b/patches/server/0306-BlockDestroyEvent.patch similarity index 100% rename from patches/server/0307-BlockDestroyEvent.patch rename to patches/server/0306-BlockDestroyEvent.patch diff --git a/patches/server/0308-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/server/0307-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch similarity index 100% rename from patches/server/0308-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch rename to patches/server/0307-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch diff --git a/patches/server/0309-Limit-Client-Sign-length-more.patch b/patches/server/0308-Limit-Client-Sign-length-more.patch similarity index 100% rename from patches/server/0309-Limit-Client-Sign-length-more.patch rename to patches/server/0308-Limit-Client-Sign-length-more.patch diff --git a/patches/server/0310-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/server/0309-Don-t-check-ConvertSigns-boolean-every-sign-save.patch similarity index 100% rename from patches/server/0310-Don-t-check-ConvertSigns-boolean-every-sign-save.patch rename to patches/server/0309-Don-t-check-ConvertSigns-boolean-every-sign-save.patch diff --git a/patches/server/0311-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0310-Optimize-Network-Manager-and-add-advanced-packet-sup.patch similarity index 100% rename from patches/server/0311-Optimize-Network-Manager-and-add-advanced-packet-sup.patch rename to patches/server/0310-Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/patches/server/0312-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0311-Handle-Oversized-Tile-Entities-in-chunks.patch similarity index 100% rename from patches/server/0312-Handle-Oversized-Tile-Entities-in-chunks.patch rename to patches/server/0311-Handle-Oversized-Tile-Entities-in-chunks.patch diff --git a/patches/server/0313-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/patches/server/0312-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch similarity index 100% rename from patches/server/0313-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch rename to patches/server/0312-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch diff --git a/patches/server/0314-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/patches/server/0313-Set-Zombie-last-tick-at-start-of-drowning-process.patch similarity index 100% rename from patches/server/0314-Set-Zombie-last-tick-at-start-of-drowning-process.patch rename to patches/server/0313-Set-Zombie-last-tick-at-start-of-drowning-process.patch diff --git a/patches/server/0315-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0314-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch similarity index 100% rename from patches/server/0315-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch rename to patches/server/0314-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch diff --git a/patches/server/0316-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/patches/server/0315-Use-proper-max-length-when-serialising-BungeeCord-te.patch similarity index 100% rename from patches/server/0316-Use-proper-max-length-when-serialising-BungeeCord-te.patch rename to patches/server/0315-Use-proper-max-length-when-serialising-BungeeCord-te.patch diff --git a/patches/server/0317-Entity-getEntitySpawnReason.patch b/patches/server/0316-Entity-getEntitySpawnReason.patch similarity index 100% rename from patches/server/0317-Entity-getEntitySpawnReason.patch rename to patches/server/0316-Entity-getEntitySpawnReason.patch diff --git a/patches/server/0318-Update-entity-Metadata-for-all-tracked-players.patch b/patches/server/0317-Update-entity-Metadata-for-all-tracked-players.patch similarity index 100% rename from patches/server/0318-Update-entity-Metadata-for-all-tracked-players.patch rename to patches/server/0317-Update-entity-Metadata-for-all-tracked-players.patch diff --git a/patches/server/0319-Fire-event-on-GS4-query.patch b/patches/server/0318-Fire-event-on-GS4-query.patch similarity index 100% rename from patches/server/0319-Fire-event-on-GS4-query.patch rename to patches/server/0318-Fire-event-on-GS4-query.patch diff --git a/patches/server/0320-Implement-PlayerPostRespawnEvent.patch b/patches/server/0319-Implement-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/server/0320-Implement-PlayerPostRespawnEvent.patch rename to patches/server/0319-Implement-PlayerPostRespawnEvent.patch diff --git a/patches/server/0321-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0320-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch similarity index 100% rename from patches/server/0321-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch rename to patches/server/0320-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch diff --git a/patches/server/0322-Server-Tick-Events.patch b/patches/server/0321-Server-Tick-Events.patch similarity index 100% rename from patches/server/0322-Server-Tick-Events.patch rename to patches/server/0321-Server-Tick-Events.patch diff --git a/patches/server/0323-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0322-PlayerDeathEvent-getItemsToKeep.patch similarity index 92% rename from patches/server/0323-PlayerDeathEvent-getItemsToKeep.patch rename to patches/server/0322-PlayerDeathEvent-getItemsToKeep.patch index 640b82f28..c428d8a18 100644 --- a/patches/server/0323-PlayerDeathEvent-getItemsToKeep.patch +++ b/patches/server/0322-PlayerDeathEvent-getItemsToKeep.patch @@ -8,10 +8,10 @@ Exposes a mutable array on items a player should keep on death Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a342fe47deb46e69f14d20029af8d94e11726e57..63421efc249691e5db7ed9db9b849f7374817e98 100644 +index 6d723445f80fc6db5880f658098046de5f13f563..dac01b65319ee246ddbb974ad379e2bd59033830 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -725,6 +725,46 @@ public class ServerPlayer extends Player { +@@ -724,6 +724,46 @@ public class ServerPlayer extends Player { }); } @@ -58,7 +58,7 @@ index a342fe47deb46e69f14d20029af8d94e11726e57..63421efc249691e5db7ed9db9b849f73 @Override public void die(DamageSource source) { boolean flag = this.level.getGameRules().getBoolean(GameRules.RULE_SHOWDEATHMESSAGES); -@@ -811,6 +851,12 @@ public class ServerPlayer extends Player { +@@ -810,6 +850,12 @@ public class ServerPlayer extends Player { // we clean the player's inventory after the EntityDeathEvent is called so plugins can get the exact state of the inventory. if (!event.getKeepInventory()) { this.getInventory().clearContent(); diff --git a/patches/server/0324-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0323-Optimize-Captured-TileEntity-Lookup.patch similarity index 100% rename from patches/server/0324-Optimize-Captured-TileEntity-Lookup.patch rename to patches/server/0323-Optimize-Captured-TileEntity-Lookup.patch diff --git a/patches/server/0325-Add-Heightmap-API.patch b/patches/server/0324-Add-Heightmap-API.patch similarity index 100% rename from patches/server/0325-Add-Heightmap-API.patch rename to patches/server/0324-Add-Heightmap-API.patch diff --git a/patches/server/0326-Mob-Spawner-API-Enhancements.patch b/patches/server/0325-Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/server/0326-Mob-Spawner-API-Enhancements.patch rename to patches/server/0325-Mob-Spawner-API-Enhancements.patch diff --git a/patches/server/0327-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0326-Fix-CB-call-to-changed-postToMainThread-method.patch similarity index 100% rename from patches/server/0327-Fix-CB-call-to-changed-postToMainThread-method.patch rename to patches/server/0326-Fix-CB-call-to-changed-postToMainThread-method.patch diff --git a/patches/server/0328-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0327-Fix-sounds-when-item-frames-are-modified-MC-123450.patch similarity index 100% rename from patches/server/0328-Fix-sounds-when-item-frames-are-modified-MC-123450.patch rename to patches/server/0327-Fix-sounds-when-item-frames-are-modified-MC-123450.patch diff --git a/patches/server/0329-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/patches/server/0328-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch similarity index 100% rename from patches/server/0329-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch rename to patches/server/0328-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch diff --git a/patches/server/0330-improve-CraftWorld-isChunkLoaded.patch b/patches/server/0329-improve-CraftWorld-isChunkLoaded.patch similarity index 100% rename from patches/server/0330-improve-CraftWorld-isChunkLoaded.patch rename to patches/server/0329-improve-CraftWorld-isChunkLoaded.patch diff --git a/patches/server/0331-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0330-Configurable-Keep-Spawn-Loaded-range-per-world.patch similarity index 99% rename from patches/server/0331-Configurable-Keep-Spawn-Loaded-range-per-world.patch rename to patches/server/0330-Configurable-Keep-Spawn-Loaded-range-per-world.patch index 0902b4a9c..1b5ab2799 100644 --- a/patches/server/0331-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/patches/server/0330-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world This lets you disable it for some worlds and lower it for others. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 13e730b18c346934c061fb570048623ad66e7344..090958a30ce20ff01ae77d4cd821a167474f0214 100644 +index 2a7d31f533240e0b683c00d65f5632d7a8ff236d..3816623fa85db14a89bd165221695de1a39e70c0 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -36,6 +36,12 @@ public class PaperWorldConfig { diff --git a/patches/server/0332-ChunkMapDistance-CME.patch b/patches/server/0331-ChunkMapDistance-CME.patch similarity index 100% rename from patches/server/0332-ChunkMapDistance-CME.patch rename to patches/server/0331-ChunkMapDistance-CME.patch diff --git a/patches/server/0333-Implement-CraftBlockSoundGroup.patch b/patches/server/0332-Implement-CraftBlockSoundGroup.patch similarity index 100% rename from patches/server/0333-Implement-CraftBlockSoundGroup.patch rename to patches/server/0332-Implement-CraftBlockSoundGroup.patch diff --git a/patches/server/0334-Chunk-debug-command.patch b/patches/server/0333-Chunk-debug-command.patch similarity index 100% rename from patches/server/0334-Chunk-debug-command.patch rename to patches/server/0333-Chunk-debug-command.patch diff --git a/patches/server/0335-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0334-Allow-Saving-of-Oversized-Chunks.patch similarity index 100% rename from patches/server/0335-Allow-Saving-of-Oversized-Chunks.patch rename to patches/server/0334-Allow-Saving-of-Oversized-Chunks.patch diff --git a/patches/server/0336-Expose-the-internal-current-tick.patch b/patches/server/0335-Expose-the-internal-current-tick.patch similarity index 100% rename from patches/server/0336-Expose-the-internal-current-tick.patch rename to patches/server/0335-Expose-the-internal-current-tick.patch diff --git a/patches/server/0337-Fix-World-isChunkGenerated-calls.patch b/patches/server/0336-Fix-World-isChunkGenerated-calls.patch similarity index 100% rename from patches/server/0337-Fix-World-isChunkGenerated-calls.patch rename to patches/server/0336-Fix-World-isChunkGenerated-calls.patch 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 100% 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 diff --git a/patches/server/0343-Fix-MC-158900.patch b/patches/server/0342-Fix-MC-158900.patch similarity index 100% rename from patches/server/0343-Fix-MC-158900.patch rename to patches/server/0342-Fix-MC-158900.patch diff --git a/patches/server/0344-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0343-Prevent-consuming-the-wrong-itemstack.patch similarity index 100% rename from patches/server/0344-Prevent-consuming-the-wrong-itemstack.patch rename to patches/server/0343-Prevent-consuming-the-wrong-itemstack.patch diff --git a/patches/server/0345-Generator-Settings.patch b/patches/server/0344-Generator-Settings.patch similarity index 100% rename from patches/server/0345-Generator-Settings.patch rename to patches/server/0344-Generator-Settings.patch diff --git a/patches/server/0346-Fix-MC-161754.patch b/patches/server/0345-Fix-MC-161754.patch similarity index 100% rename from patches/server/0346-Fix-MC-161754.patch rename to patches/server/0345-Fix-MC-161754.patch diff --git a/patches/server/0347-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/patches/server/0346-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch similarity index 100% rename from patches/server/0347-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch rename to patches/server/0346-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch diff --git a/patches/server/0348-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/patches/server/0347-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch similarity index 91% rename from patches/server/0348-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch rename to patches/server/0347-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch index b5a03a0dd..dff3109de 100644 --- a/patches/server/0348-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch +++ b/patches/server/0347-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix stuck in sneak when changing worlds (MC-10657) diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 63421efc249691e5db7ed9db9b849f7374817e98..91267d3e8a76251d2e590222bebe1f1c428e4533 100644 +index dac01b65319ee246ddbb974ad379e2bd59033830..289b2881c0f16d1cb54a70b25b9bfd808988cb9a 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1099,6 +1099,8 @@ public class ServerPlayer extends Player { +@@ -1098,6 +1098,8 @@ public class ServerPlayer extends Player { this.lastSentHealth = -1.0F; this.lastSentFood = -1; diff --git a/patches/server/0349-Add-option-to-disable-pillager-patrols.patch b/patches/server/0348-Add-option-to-disable-pillager-patrols.patch similarity index 100% rename from patches/server/0349-Add-option-to-disable-pillager-patrols.patch rename to patches/server/0348-Add-option-to-disable-pillager-patrols.patch diff --git a/patches/server/0350-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/patches/server/0349-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch similarity index 100% rename from patches/server/0350-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch rename to patches/server/0349-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch diff --git a/patches/server/0351-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0350-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch similarity index 100% rename from patches/server/0351-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch rename to patches/server/0350-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch diff --git a/patches/server/0352-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0351-MC-145656-Fix-Follow-Range-Initial-Target.patch similarity index 100% rename from patches/server/0352-MC-145656-Fix-Follow-Range-Initial-Target.patch rename to patches/server/0351-MC-145656-Fix-Follow-Range-Initial-Target.patch diff --git a/patches/server/0353-Duplicate-UUID-Resolve-Option.patch b/patches/server/0352-Duplicate-UUID-Resolve-Option.patch similarity index 100% rename from patches/server/0353-Duplicate-UUID-Resolve-Option.patch rename to patches/server/0352-Duplicate-UUID-Resolve-Option.patch diff --git a/patches/server/0354-Optimize-Hoppers.patch b/patches/server/0353-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0354-Optimize-Hoppers.patch rename to patches/server/0353-Optimize-Hoppers.patch diff --git a/patches/server/0355-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0354-PlayerDeathEvent-shouldDropExperience.patch similarity index 85% rename from patches/server/0355-PlayerDeathEvent-shouldDropExperience.patch rename to patches/server/0354-PlayerDeathEvent-shouldDropExperience.patch index 0fbe5a06d..c5d7d78ae 100644 --- a/patches/server/0355-PlayerDeathEvent-shouldDropExperience.patch +++ b/patches/server/0354-PlayerDeathEvent-shouldDropExperience.patch @@ -5,10 +5,10 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 91267d3e8a76251d2e590222bebe1f1c428e4533..2a7b0d5de81665a5b899ab85cd1fa30be29f9b3e 100644 +index 289b2881c0f16d1cb54a70b25b9bfd808988cb9a..10c56aa51a6dcfec8ef00faeeea4191188f24d36 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -847,7 +847,7 @@ public class ServerPlayer extends Player { +@@ -846,7 +846,7 @@ public class ServerPlayer extends Player { this.tellNeutralMobsThatIDied(); } // SPIGOT-5478 must be called manually now diff --git a/patches/server/0356-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0355-Prevent-bees-loading-chunks-checking-hive-position.patch similarity index 100% rename from patches/server/0356-Prevent-bees-loading-chunks-checking-hive-position.patch rename to patches/server/0355-Prevent-bees-loading-chunks-checking-hive-position.patch diff --git a/patches/server/0357-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0356-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 100% rename from patches/server/0357-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to patches/server/0356-Don-t-load-Chunks-from-Hoppers-and-other-things.patch diff --git a/patches/server/0358-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0357-Guard-against-serializing-mismatching-chunk-coordina.patch similarity index 100% rename from patches/server/0358-Guard-against-serializing-mismatching-chunk-coordina.patch rename to patches/server/0357-Guard-against-serializing-mismatching-chunk-coordina.patch diff --git a/patches/server/0359-Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/server/0358-Optimise-IEntityAccess-getPlayerByUUID.patch similarity index 100% rename from patches/server/0359-Optimise-IEntityAccess-getPlayerByUUID.patch rename to patches/server/0358-Optimise-IEntityAccess-getPlayerByUUID.patch diff --git a/patches/server/0360-Fix-items-not-falling-correctly.patch b/patches/server/0359-Fix-items-not-falling-correctly.patch similarity index 100% rename from patches/server/0360-Fix-items-not-falling-correctly.patch rename to patches/server/0359-Fix-items-not-falling-correctly.patch diff --git a/patches/server/0361-Lag-compensate-eating.patch b/patches/server/0360-Lag-compensate-eating.patch similarity index 100% rename from patches/server/0361-Lag-compensate-eating.patch rename to patches/server/0360-Lag-compensate-eating.patch diff --git a/patches/server/0362-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0361-Optimize-call-to-getFluid-for-explosions.patch similarity index 100% rename from patches/server/0362-Optimize-call-to-getFluid-for-explosions.patch rename to patches/server/0361-Optimize-call-to-getFluid-for-explosions.patch diff --git a/patches/server/0363-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0362-Fix-last-firework-in-stack-not-having-effects-when-d.patch similarity index 100% rename from patches/server/0363-Fix-last-firework-in-stack-not-having-effects-when-d.patch rename to patches/server/0362-Fix-last-firework-in-stack-not-having-effects-when-d.patch diff --git a/patches/server/0364-Add-effect-to-block-break-naturally.patch b/patches/server/0363-Add-effect-to-block-break-naturally.patch similarity index 100% rename from patches/server/0364-Add-effect-to-block-break-naturally.patch rename to patches/server/0363-Add-effect-to-block-break-naturally.patch diff --git a/patches/server/0365-Entity-Activation-Range-2.0.patch b/patches/server/0364-Entity-Activation-Range-2.0.patch similarity index 100% rename from patches/server/0365-Entity-Activation-Range-2.0.patch rename to patches/server/0364-Entity-Activation-Range-2.0.patch diff --git a/patches/server/0366-Increase-Light-Queue-Size.patch b/patches/server/0365-Increase-Light-Queue-Size.patch similarity index 100% rename from patches/server/0366-Increase-Light-Queue-Size.patch rename to patches/server/0365-Increase-Light-Queue-Size.patch diff --git a/patches/server/0367-Fix-Light-Command.patch b/patches/server/0366-Fix-Light-Command.patch similarity index 100% rename from patches/server/0367-Fix-Light-Command.patch rename to patches/server/0366-Fix-Light-Command.patch diff --git a/patches/server/0368-Anti-Xray.patch b/patches/server/0367-Anti-Xray.patch similarity index 99% rename from patches/server/0368-Anti-Xray.patch rename to patches/server/0367-Anti-Xray.patch index 871933327..1004ff2bf 100644 --- a/patches/server/0368-Anti-Xray.patch +++ b/patches/server/0367-Anti-Xray.patch @@ -1117,7 +1117,7 @@ index 8a1df5b26a6ba0e2fa13a9974cf41384a8e6d4fe..0df81cbddf2e7f164861b95cf572f9d6 this.convertable = convertable_conversionsession; this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelPath.toFile()); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 8659df9d2e9d8b3b0cd992efc9a1f3b2d958e9c8..3f7919f4e8f5a5b79bf4e541ea5f4ce482965fa1 100644 +index 6219634a57976a6a0a9b32ed08d56107d6b5d1c3..31e3534d6e15f91d781fabb0670e53ef66cb8977 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -49,7 +49,7 @@ import org.bukkit.event.player.PlayerInteractEvent; diff --git a/patches/server/0369-No-Tick-view-distance-implementation.patch b/patches/server/0368-No-Tick-view-distance-implementation.patch similarity index 99% rename from patches/server/0369-No-Tick-view-distance-implementation.patch rename to patches/server/0368-No-Tick-view-distance-implementation.patch index 9ce8bd213..46ef442a2 100644 --- a/patches/server/0369-No-Tick-view-distance-implementation.patch +++ b/patches/server/0368-No-Tick-view-distance-implementation.patch @@ -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 2a7b0d5de81665a5b899ab85cd1fa30be29f9b3e..7efaf53b4df9d4e7e88020ce4ca41c9222fa8064 100644 +index 10c56aa51a6dcfec8ef00faeeea4191188f24d36..0b11b136834f57a633f9461c7ad956b3c531f3ea 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -242,6 +242,7 @@ public class ServerPlayer extends Player { 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 100% rename from patches/server/0371-Tracking-Range-Improvements.patch rename to patches/server/0370-Tracking-Range-Improvements.patch 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 100% rename from patches/server/0372-Fix-items-vanishing-through-end-portal.patch rename to patches/server/0371-Fix-items-vanishing-through-end-portal.patch 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 4b46758b3..b6b240bd2 100644 --- a/patches/server/0373-implement-optional-per-player-mob-spawns.patch +++ b/patches/server/0372-implement-optional-per-player-mob-spawns.patch @@ -617,7 +617,7 @@ index ddd535ad7d2b051e0d05320e4491bad46df8ffbe..cb273030b70f1d41110b90effe3d542a 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 7efaf53b4df9d4e7e88020ce4ca41c9222fa8064..5b642969f61d4f62f3f40447252c622806d2a9c6 100644 +index 0b11b136834f57a633f9461c7ad956b3c531f3ea..61202cc8610b9becb5e44e1897ff372bc1e5a2ac 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -224,6 +224,11 @@ public class ServerPlayer extends Player { 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 100% 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 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 100% rename from patches/server/0376-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/server/0375-Optimise-getChunkAt-calls-for-loaded-chunks.patch 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 100% rename from patches/server/0377-Add-debug-for-sync-chunk-loads.patch rename to patches/server/0376-Add-debug-for-sync-chunk-loads.patch 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 100% rename from patches/server/0378-Allow-overriding-the-java-version-check.patch rename to patches/server/0377-Allow-overriding-the-java-version-check.patch 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 100% 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 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 100% rename from patches/server/0389-Optimise-TickListServer-by-rewriting-it.patch rename to patches/server/0388-Optimise-TickListServer-by-rewriting-it.patch 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 29f20cfe0..6095f709a 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 1218411afe1e2e3c2ee54aec6287ff33b59afd01..03c45d4fa891e9f00d4b6b24cfc14408 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 5b642969f61d4f62f3f40447252c622806d2a9c6..31a2cbcb103174053f7f22c7d53c69cb8a8221c7 100644 +index 61202cc8610b9becb5e44e1897ff372bc1e5a2ac..7ef6f889ed4b94559bf270f097ee4cc49e9f4df6 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -220,6 +220,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 100% rename from patches/server/0393-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/server/0392-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch 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 100% rename from patches/server/0394-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/0393-Optimize-Collision-to-not-load-chunks.patch diff --git a/patches/server/0395-Don-t-tick-dead-players.patch b/patches/server/0394-Don-t-tick-dead-players.patch similarity index 85% rename from patches/server/0395-Don-t-tick-dead-players.patch rename to patches/server/0394-Don-t-tick-dead-players.patch index 950cdd119..029b1777b 100644 --- a/patches/server/0395-Don-t-tick-dead-players.patch +++ b/patches/server/0394-Don-t-tick-dead-players.patch @@ -7,10 +7,10 @@ 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 31a2cbcb103174053f7f22c7d53c69cb8a8221c7..3854d1b5acb6d877c2b64f274031574c890822a9 100644 +index 7ef6f889ed4b94559bf270f097ee4cc49e9f4df6..f158f77e4a397673b18827883a2eda99c9aaf028 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -639,7 +639,7 @@ public class ServerPlayer extends Player { +@@ -638,7 +638,7 @@ public class ServerPlayer extends Player { public void doTick() { try { 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-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0396-Don-t-move-existing-players-to-world-spawn.patch similarity index 93% rename from patches/server/0397-Don-t-move-existing-players-to-world-spawn.patch rename to patches/server/0396-Don-t-move-existing-players-to-world-spawn.patch index 75f987036..af3fa0652 100644 --- a/patches/server/0397-Don-t-move-existing-players-to-world-spawn.patch +++ b/patches/server/0396-Don-t-move-existing-players-to-world-spawn.patch @@ -10,7 +10,7 @@ larger than the keep loaded range. By skipping this, we avoid potential for a large spike on server start. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 3854d1b5acb6d877c2b64f274031574c890822a9..5559daa44369304c5c7bdccb35d27a84cb72f9b3 100644 +index f158f77e4a397673b18827883a2eda99c9aaf028..3f57c10472c8add423f1d237ad03e525113e444c 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -310,7 +310,7 @@ public class ServerPlayer extends Player { @@ -22,7 +22,7 @@ index 3854d1b5acb6d877c2b64f274031574c890822a9..5559daa44369304c5c7bdccb35d27a84 this.cachedSingleHashSet = new com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper -@@ -529,7 +529,7 @@ public class ServerPlayer extends Player { +@@ -528,7 +528,7 @@ public class ServerPlayer extends Player { position = Vec3.atCenterOf(((ServerLevel) world).getSharedSpawnPos()); } this.level = world; diff --git a/patches/server/0398-Add-tick-times-API-and-mspt-command.patch b/patches/server/0397-Add-tick-times-API-and-mspt-command.patch similarity index 100% rename from patches/server/0398-Add-tick-times-API-and-mspt-command.patch rename to patches/server/0397-Add-tick-times-API-and-mspt-command.patch diff --git a/patches/server/0399-Expose-MinecraftServer-isRunning.patch b/patches/server/0398-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/server/0399-Expose-MinecraftServer-isRunning.patch rename to patches/server/0398-Expose-MinecraftServer-isRunning.patch diff --git a/patches/server/0400-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0399-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/server/0400-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/server/0399-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/server/0401-Remove-streams-from-Mob-AI-System.patch b/patches/server/0400-Remove-streams-from-Mob-AI-System.patch similarity index 100% rename from patches/server/0401-Remove-streams-from-Mob-AI-System.patch rename to patches/server/0400-Remove-streams-from-Mob-AI-System.patch diff --git a/patches/server/0402-Async-command-map-building.patch b/patches/server/0401-Async-command-map-building.patch similarity index 100% rename from patches/server/0402-Async-command-map-building.patch rename to patches/server/0401-Async-command-map-building.patch diff --git a/patches/server/0403-Improved-Watchdog-Support.patch b/patches/server/0402-Improved-Watchdog-Support.patch similarity index 100% rename from patches/server/0403-Improved-Watchdog-Support.patch rename to patches/server/0402-Improved-Watchdog-Support.patch diff --git a/patches/server/0404-Optimize-Pathfinding.patch b/patches/server/0403-Optimize-Pathfinding.patch similarity index 100% rename from patches/server/0404-Optimize-Pathfinding.patch rename to patches/server/0403-Optimize-Pathfinding.patch diff --git a/patches/server/0405-Reduce-Either-Optional-allocation.patch b/patches/server/0404-Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/0405-Reduce-Either-Optional-allocation.patch rename to patches/server/0404-Reduce-Either-Optional-allocation.patch diff --git a/patches/server/0406-Remove-streams-from-PairedQueue.patch b/patches/server/0405-Remove-streams-from-PairedQueue.patch similarity index 100% rename from patches/server/0406-Remove-streams-from-PairedQueue.patch rename to patches/server/0405-Remove-streams-from-PairedQueue.patch diff --git a/patches/server/0407-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0406-Reduce-memory-footprint-of-NBTTagCompound.patch similarity index 100% rename from patches/server/0407-Reduce-memory-footprint-of-NBTTagCompound.patch rename to patches/server/0406-Reduce-memory-footprint-of-NBTTagCompound.patch diff --git a/patches/server/0408-Prevent-opening-inventories-when-frozen.patch b/patches/server/0407-Prevent-opening-inventories-when-frozen.patch similarity index 94% rename from patches/server/0408-Prevent-opening-inventories-when-frozen.patch rename to patches/server/0407-Prevent-opening-inventories-when-frozen.patch index c4f0f5682..1afba834f 100644 --- a/patches/server/0408-Prevent-opening-inventories-when-frozen.patch +++ b/patches/server/0407-Prevent-opening-inventories-when-frozen.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Prevent opening inventories when frozen diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 5559daa44369304c5c7bdccb35d27a84cb72f9b3..378d82e95978a0ce1636b88cf7c9dda38b2718b0 100644 +index 3f57c10472c8add423f1d237ad03e525113e444c..3d17c7c5c35133c3aefce9c2706b669011c6edac 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -610,7 +610,7 @@ public class ServerPlayer extends Player { +@@ -609,7 +609,7 @@ public class ServerPlayer extends Player { containerUpdateDelay = level.paperConfig.containerUpdateTickRate; } // Paper end @@ -17,7 +17,7 @@ index 5559daa44369304c5c7bdccb35d27a84cb72f9b3..378d82e95978a0ce1636b88cf7c9dda3 this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.CANT_USE); // Paper this.containerMenu = this.inventoryMenu; } -@@ -1457,7 +1457,7 @@ public class ServerPlayer extends Player { +@@ -1456,7 +1456,7 @@ public class ServerPlayer extends Player { } else { // CraftBukkit start this.containerMenu = container; diff --git a/patches/server/0409-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0408-Optimise-ArraySetSorted-removeIf.patch similarity index 100% rename from patches/server/0409-Optimise-ArraySetSorted-removeIf.patch rename to patches/server/0408-Optimise-ArraySetSorted-removeIf.patch diff --git a/patches/server/0410-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0409-Don-t-run-entity-collision-code-if-not-needed.patch similarity index 100% rename from patches/server/0410-Don-t-run-entity-collision-code-if-not-needed.patch rename to patches/server/0409-Don-t-run-entity-collision-code-if-not-needed.patch diff --git a/patches/server/0411-Restrict-vanilla-teleport-command-to-valid-locations.patch b/patches/server/0410-Restrict-vanilla-teleport-command-to-valid-locations.patch similarity index 100% rename from patches/server/0411-Restrict-vanilla-teleport-command-to-valid-locations.patch rename to patches/server/0410-Restrict-vanilla-teleport-command-to-valid-locations.patch diff --git a/patches/server/0412-Implement-Player-Client-Options-API.patch b/patches/server/0411-Implement-Player-Client-Options-API.patch similarity index 97% rename from patches/server/0412-Implement-Player-Client-Options-API.patch rename to patches/server/0411-Implement-Player-Client-Options-API.patch index 948409b60..29298ae9c 100644 --- a/patches/server/0412-Implement-Player-Client-Options-API.patch +++ b/patches/server/0411-Implement-Player-Client-Options-API.patch @@ -85,10 +85,10 @@ index 0000000000000000000000000000000000000000..b6f4400df3d8ec7e06a996de54f8cabb + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 378d82e95978a0ce1636b88cf7c9dda38b2718b0..fdd6f08d2bf3610417e42ae3504b1a40d864a2b6 100644 +index 3d17c7c5c35133c3aefce9c2706b669011c6edac..18945fe987f7464f9bc1a55145b3456c76859603 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1809,6 +1809,7 @@ public class ServerPlayer extends Player { +@@ -1808,6 +1808,7 @@ public class ServerPlayer extends Player { public String locale = null; // CraftBukkit - add, lowercase // Paper - default to null public java.util.Locale adventure$locale = java.util.Locale.US; // Paper public void updateOptions(ServerboundClientInformationPacket packet) { diff --git a/patches/server/0413-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/server/0412-Fix-Chunk-Post-Processing-deadlock-risk.patch similarity index 100% rename from patches/server/0413-Fix-Chunk-Post-Processing-deadlock-risk.patch rename to patches/server/0412-Fix-Chunk-Post-Processing-deadlock-risk.patch diff --git a/patches/server/0414-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0413-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/0414-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/server/0413-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/0415-Broadcast-join-message-to-console.patch b/patches/server/0414-Broadcast-join-message-to-console.patch similarity index 100% rename from patches/server/0415-Broadcast-join-message-to-console.patch rename to patches/server/0414-Broadcast-join-message-to-console.patch diff --git a/patches/server/0416-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0415-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch similarity index 98% rename from patches/server/0416-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to patches/server/0415-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch index 77abcfad4..d7c82fe39 100644 --- a/patches/server/0416-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch +++ b/patches/server/0415-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch @@ -40,7 +40,7 @@ index 205d6b9d822d3d28c9e8c3f5a511384ce82adc99..22c691f3bfbfc5f8e7420c14de36a353 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 fdd6f08d2bf3610417e42ae3504b1a40d864a2b6..9303a574624d9829fdd6b18e07331a99d5745eed 100644 +index 18945fe987f7464f9bc1a55145b3456c76859603..35bd140c7026a5d3f9e73c67716e983c1464ed8c 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -243,6 +243,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0417-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0416-Load-Chunks-for-Login-Asynchronously.patch similarity index 99% rename from patches/server/0417-Load-Chunks-for-Login-Asynchronously.patch rename to patches/server/0416-Load-Chunks-for-Login-Asynchronously.patch index 42104b540..4c7ea5bcf 100644 --- a/patches/server/0417-Load-Chunks-for-Login-Asynchronously.patch +++ b/patches/server/0416-Load-Chunks-for-Login-Asynchronously.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Load Chunks for Login Asynchronously diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 9303a574624d9829fdd6b18e07331a99d5745eed..e98ae3630576ae67e24460f90e577b34f246a150 100644 +index 35bd140c7026a5d3f9e73c67716e983c1464ed8c..2a5e811bd552ca3583cfa9cd57e68e7a7050bf8b 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -178,6 +178,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0418-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0417-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 100% rename from patches/server/0418-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/server/0417-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch diff --git a/patches/server/0419-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0418-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/server/0419-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/server/0418-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/server/0420-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0419-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0420-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/server/0419-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0421-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0420-Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from patches/server/0421-Add-phantom-creative-and-insomniac-controls.patch rename to patches/server/0420-Add-phantom-creative-and-insomniac-controls.patch diff --git a/patches/server/0422-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0421-Fix-numerous-item-duplication-issues-and-teleport-is.patch similarity index 100% rename from patches/server/0422-Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to patches/server/0421-Fix-numerous-item-duplication-issues-and-teleport-is.patch diff --git a/patches/server/0423-Implement-Brigadier-Mojang-API.patch b/patches/server/0422-Implement-Brigadier-Mojang-API.patch similarity index 100% rename from patches/server/0423-Implement-Brigadier-Mojang-API.patch rename to patches/server/0422-Implement-Brigadier-Mojang-API.patch diff --git a/patches/server/0424-Villager-Restocks-API.patch b/patches/server/0423-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0424-Villager-Restocks-API.patch rename to patches/server/0423-Villager-Restocks-API.patch diff --git a/patches/server/0425-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0424-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 100% rename from patches/server/0425-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/server/0424-Validate-PickItem-Packet-and-kick-for-invalid.patch diff --git a/patches/server/0426-Expose-game-version.patch b/patches/server/0425-Expose-game-version.patch similarity index 100% rename from patches/server/0426-Expose-game-version.patch rename to patches/server/0425-Expose-game-version.patch diff --git a/patches/server/0427-Optimize-Voxel-Shape-Merging.patch b/patches/server/0426-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/0427-Optimize-Voxel-Shape-Merging.patch rename to patches/server/0426-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/0428-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0427-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 100% rename from patches/server/0428-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/server/0427-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch diff --git a/patches/server/0429-Implement-Mob-Goal-API.patch b/patches/server/0428-Implement-Mob-Goal-API.patch similarity index 100% rename from patches/server/0429-Implement-Mob-Goal-API.patch rename to patches/server/0428-Implement-Mob-Goal-API.patch diff --git a/patches/server/0430-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0429-Use-distance-map-to-optimise-entity-tracker.patch similarity index 100% rename from patches/server/0430-Use-distance-map-to-optimise-entity-tracker.patch rename to patches/server/0429-Use-distance-map-to-optimise-entity-tracker.patch diff --git a/patches/server/0431-Optimize-isOutsideRange-to-use-distance-maps.patch b/patches/server/0430-Optimize-isOutsideRange-to-use-distance-maps.patch similarity index 99% rename from patches/server/0431-Optimize-isOutsideRange-to-use-distance-maps.patch rename to patches/server/0430-Optimize-isOutsideRange-to-use-distance-maps.patch index c96848946..d1e178d2d 100644 --- a/patches/server/0431-Optimize-isOutsideRange-to-use-distance-maps.patch +++ b/patches/server/0430-Optimize-isOutsideRange-to-use-distance-maps.patch @@ -37,7 +37,7 @@ index a3ba56f437fe9e4dac59370463052341eb9b7524..c6c4d2fd3205dfcaff9e0f1a6b92b749 // CraftBukkit start diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 5f8399cc2ba5114d11298808528b18f044c650ce..af8b6138127d033a92fa03f0bc4ba7ef61afc296 100644 +index 136b832c1a04042457817b2bf2a4a5d057d1b6ca..035061a3cb18566c296875a250ff6e2aeea0bf8e 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -205,6 +205,17 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -362,7 +362,7 @@ index abd814f397a90fcaaf98a76ed83b5f9f76f2948e..0ce86c72cb829b816ec7bfb8f0d19396 } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index e98ae3630576ae67e24460f90e577b34f246a150..009b6fe428db1a6e69403d8df32325f78e6b4461 100644 +index 2a5e811bd552ca3583cfa9cd57e68e7a7050bf8b..eb392fd936f0951c12d9ecfc3c557de14d112e8e 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -250,6 +250,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0432-Add-villager-reputation-API.patch b/patches/server/0431-Add-villager-reputation-API.patch similarity index 100% rename from patches/server/0432-Add-villager-reputation-API.patch rename to patches/server/0431-Add-villager-reputation-API.patch diff --git a/patches/server/0433-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0432-Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 100% rename from patches/server/0433-Option-for-maximum-exp-value-when-merging-orbs.patch rename to patches/server/0432-Option-for-maximum-exp-value-when-merging-orbs.patch diff --git a/patches/server/0434-ExperienceOrbMergeEvent.patch b/patches/server/0433-ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/server/0434-ExperienceOrbMergeEvent.patch rename to patches/server/0433-ExperienceOrbMergeEvent.patch diff --git a/patches/server/0435-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0434-Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/0435-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/server/0434-Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/0436-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0435-Optimize-brigadier-child-sorting-performance.patch similarity index 100% rename from patches/server/0436-Optimize-brigadier-child-sorting-performance.patch rename to patches/server/0435-Optimize-brigadier-child-sorting-performance.patch diff --git a/patches/server/0437-Potential-bed-API.patch b/patches/server/0436-Potential-bed-API.patch similarity index 100% rename from patches/server/0437-Potential-bed-API.patch rename to patches/server/0436-Potential-bed-API.patch diff --git a/patches/server/0438-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0437-Wait-for-Async-Tasks-during-shutdown.patch similarity index 100% rename from patches/server/0438-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/server/0437-Wait-for-Async-Tasks-during-shutdown.patch diff --git a/patches/server/0439-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0438-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from patches/server/0439-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to patches/server/0438-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/patches/server/0440-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0439-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from patches/server/0440-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/server/0439-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/patches/server/0441-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0440-Reduce-MutableInt-allocations-from-light-engine.patch similarity index 100% rename from patches/server/0441-Reduce-MutableInt-allocations-from-light-engine.patch rename to patches/server/0440-Reduce-MutableInt-allocations-from-light-engine.patch diff --git a/patches/server/0442-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0441-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 97% rename from patches/server/0442-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/server/0441-Reduce-allocation-of-Vec3D-by-entity-tracker.patch index d6a2ae528..3fac0fc5b 100644 --- a/patches/server/0442-Reduce-allocation-of-Vec3D-by-entity-tracker.patch +++ b/patches/server/0441-Reduce-allocation-of-Vec3D-by-entity-tracker.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Reduce allocation of Vec3D by entity tracker diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index af8b6138127d033a92fa03f0bc4ba7ef61afc296..97fbb5dd30fd28bdc3df3ab023b9098dcabc95d4 100644 +index 035061a3cb18566c296875a250ff6e2aeea0bf8e..446f8f2faecaef70b446f15a8a987b26b389b55d 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -2102,9 +2102,14 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially diff --git a/patches/server/0443-Ensure-safe-gateway-teleport.patch b/patches/server/0442-Ensure-safe-gateway-teleport.patch similarity index 100% rename from patches/server/0443-Ensure-safe-gateway-teleport.patch rename to patches/server/0442-Ensure-safe-gateway-teleport.patch diff --git a/patches/server/0444-Add-option-for-console-having-all-permissions.patch b/patches/server/0443-Add-option-for-console-having-all-permissions.patch similarity index 100% rename from patches/server/0444-Add-option-for-console-having-all-permissions.patch rename to patches/server/0443-Add-option-for-console-having-all-permissions.patch diff --git a/patches/server/0445-Optimize-ServerLevels-chunk-level-checking-methods.patch b/patches/server/0444-Optimize-ServerLevels-chunk-level-checking-methods.patch similarity index 100% rename from patches/server/0445-Optimize-ServerLevels-chunk-level-checking-methods.patch rename to patches/server/0444-Optimize-ServerLevels-chunk-level-checking-methods.patch diff --git a/patches/server/0446-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/patches/server/0445-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch similarity index 100% rename from patches/server/0446-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch rename to patches/server/0445-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch diff --git a/patches/server/0447-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/patches/server/0446-Optimize-sending-packets-to-nearby-locations-sounds-.patch similarity index 100% rename from patches/server/0447-Optimize-sending-packets-to-nearby-locations-sounds-.patch rename to patches/server/0446-Optimize-sending-packets-to-nearby-locations-sounds-.patch diff --git a/patches/server/0448-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0447-Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from patches/server/0448-Fix-villager-trading-demand-MC-163962.patch rename to patches/server/0447-Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/server/0449-Maps-shouldn-t-load-chunks.patch b/patches/server/0448-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/0449-Maps-shouldn-t-load-chunks.patch rename to patches/server/0448-Maps-shouldn-t-load-chunks.patch diff --git a/patches/server/0450-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0449-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 100% rename from patches/server/0450-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to patches/server/0449-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch diff --git a/patches/server/0451-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/server/0450-Delay-Chunk-Unloads-based-on-Player-Movement.patch similarity index 100% rename from patches/server/0451-Delay-Chunk-Unloads-based-on-Player-Movement.patch rename to patches/server/0450-Delay-Chunk-Unloads-based-on-Player-Movement.patch diff --git a/patches/server/0452-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0451-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/0452-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/0451-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/0453-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0452-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from patches/server/0453-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/server/0452-Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/patches/server/0454-incremental-chunk-saving.patch b/patches/server/0453-incremental-chunk-saving.patch similarity index 98% rename from patches/server/0454-incremental-chunk-saving.patch rename to patches/server/0453-incremental-chunk-saving.patch index b99a05ff2..0aece1a9c 100644 --- a/patches/server/0454-incremental-chunk-saving.patch +++ b/patches/server/0453-incremental-chunk-saving.patch @@ -5,7 +5,7 @@ Subject: [PATCH] incremental chunk saving diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 5638cfdf2da5cdc93ef8e868279062a892ecac5c..7ac92d856d67046a6928e8cd21a57760d4b4954c 100644 +index 3984d85f1e1833ec199fde1ba64d9c83376b1819..144a8d424cd4f953b1471f20d1521ed1b7639f1a 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -44,6 +44,21 @@ public class PaperWorldConfig { @@ -139,7 +139,7 @@ index c6c4d2fd3205dfcaff9e0f1a6b92b74903275991..fe8e6d66665dc8c38e74c0b264cf507f for (int i = 0; i < this.futures.length(); ++i) { CompletableFuture> 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 97fbb5dd30fd28bdc3df3ab023b9098dcabc95d4..2651c8161ee54a9085d43eceaeb6d16e8b693b25 100644 +index 446f8f2faecaef70b446f15a8a987b26b389b55d..daa13434cf4ba47f77b4f47c4d2ecb3d9d672031 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 diff --git a/patches/server/0455-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0454-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/server/0455-Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/server/0454-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/0456-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0455-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/0456-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/server/0455-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/0457-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0456-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from patches/server/0457-Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/server/0456-Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/server/0458-Fix-sand-duping.patch b/patches/server/0457-Fix-sand-duping.patch similarity index 100% rename from patches/server/0458-Fix-sand-duping.patch rename to patches/server/0457-Fix-sand-duping.patch diff --git a/patches/server/0459-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0458-Prevent-position-desync-in-playerconnection-causing-.patch similarity index 100% rename from patches/server/0459-Prevent-position-desync-in-playerconnection-causing-.patch rename to patches/server/0458-Prevent-position-desync-in-playerconnection-causing-.patch diff --git a/patches/server/0460-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0459-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/0460-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/server/0459-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0461-Expose-Arrow-getItemStack.patch b/patches/server/0460-Expose-Arrow-getItemStack.patch similarity index 100% rename from patches/server/0461-Expose-Arrow-getItemStack.patch rename to patches/server/0460-Expose-Arrow-getItemStack.patch diff --git a/patches/server/0462-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0461-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/server/0462-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/server/0461-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/server/0463-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0462-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0463-Hide-sync-chunk-writes-behind-flag.patch rename to patches/server/0462-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0464-Add-permission-for-command-blocks.patch b/patches/server/0463-Add-permission-for-command-blocks.patch similarity index 98% rename from patches/server/0464-Add-permission-for-command-blocks.patch rename to patches/server/0463-Add-permission-for-command-blocks.patch index 339116a74..bb60f00fe 100644 --- a/patches/server/0464-Add-permission-for-command-blocks.patch +++ b/patches/server/0463-Add-permission-for-command-blocks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add permission for command blocks diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 3f7919f4e8f5a5b79bf4e541ea5f4ce482965fa1..81275857101522b2bb8824313159744036a1cc4f 100644 +index 31e3534d6e15f91d781fabb0670e53ef66cb8977..784e6c2db5bb346408948cff8ac3cc9b964dd6d8 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -392,7 +392,7 @@ public class ServerPlayerGameMode { diff --git a/patches/server/0465-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0464-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 100% rename from patches/server/0465-Ensure-Entity-AABB-s-are-never-invalid.patch rename to patches/server/0464-Ensure-Entity-AABB-s-are-never-invalid.patch diff --git a/patches/server/0466-Optimize-WorldBorder-collision-checks-and-air.patch b/patches/server/0465-Optimize-WorldBorder-collision-checks-and-air.patch similarity index 100% rename from patches/server/0466-Optimize-WorldBorder-collision-checks-and-air.patch rename to patches/server/0465-Optimize-WorldBorder-collision-checks-and-air.patch diff --git a/patches/server/0467-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0466-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 100% rename from patches/server/0467-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/server/0466-Fix-Per-World-Difficulty-Remembering-Difficulty.patch diff --git a/patches/server/0468-Paper-dumpitem-command.patch b/patches/server/0467-Paper-dumpitem-command.patch similarity index 100% rename from patches/server/0468-Paper-dumpitem-command.patch rename to patches/server/0467-Paper-dumpitem-command.patch diff --git a/patches/server/0469-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0468-Don-t-allow-null-UUID-s-for-chat.patch similarity index 100% rename from patches/server/0469-Don-t-allow-null-UUID-s-for-chat.patch rename to patches/server/0468-Don-t-allow-null-UUID-s-for-chat.patch diff --git a/patches/server/0470-Improve-Legacy-Component-serialization-size.patch b/patches/server/0469-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0470-Improve-Legacy-Component-serialization-size.patch rename to patches/server/0469-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0471-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0470-Stop-copy-on-write-operations-for-updating-light-dat.patch similarity index 100% rename from patches/server/0471-Stop-copy-on-write-operations-for-updating-light-dat.patch rename to patches/server/0470-Stop-copy-on-write-operations-for-updating-light-dat.patch diff --git a/patches/server/0472-Support-old-UUID-format-for-NBT.patch b/patches/server/0471-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/0472-Support-old-UUID-format-for-NBT.patch rename to patches/server/0471-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/0473-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0472-Clean-up-duplicated-GameProfile-Properties.patch similarity index 100% rename from patches/server/0473-Clean-up-duplicated-GameProfile-Properties.patch rename to patches/server/0472-Clean-up-duplicated-GameProfile-Properties.patch diff --git a/patches/server/0474-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0473-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0474-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/server/0473-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0475-Remove-some-streams-from-structures.patch b/patches/server/0474-Remove-some-streams-from-structures.patch similarity index 100% rename from patches/server/0475-Remove-some-streams-from-structures.patch rename to patches/server/0474-Remove-some-streams-from-structures.patch diff --git a/patches/server/0476-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0475-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from patches/server/0476-Remove-streams-from-classes-related-villager-gossip.patch rename to patches/server/0475-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/patches/server/0477-Optimize-NibbleArray-to-use-pooled-buffers.patch b/patches/server/0476-Optimize-NibbleArray-to-use-pooled-buffers.patch similarity index 100% rename from patches/server/0477-Optimize-NibbleArray-to-use-pooled-buffers.patch rename to patches/server/0476-Optimize-NibbleArray-to-use-pooled-buffers.patch diff --git a/patches/server/0478-Support-components-in-ItemMeta.patch b/patches/server/0477-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/0478-Support-components-in-ItemMeta.patch rename to patches/server/0477-Support-components-in-ItemMeta.patch diff --git a/patches/server/0479-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0478-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch similarity index 100% rename from patches/server/0479-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch rename to patches/server/0478-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch diff --git a/patches/server/0480-Add-entity-liquid-API.patch b/patches/server/0479-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0480-Add-entity-liquid-API.patch rename to patches/server/0479-Add-entity-liquid-API.patch diff --git a/patches/server/0481-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0480-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/0481-Update-itemstack-legacy-name-and-lore.patch rename to patches/server/0480-Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/0482-Spawn-player-in-correct-world-on-login.patch b/patches/server/0481-Spawn-player-in-correct-world-on-login.patch similarity index 100% rename from patches/server/0482-Spawn-player-in-correct-world-on-login.patch rename to patches/server/0481-Spawn-player-in-correct-world-on-login.patch diff --git a/patches/server/0483-Add-PrepareResultEvent.patch b/patches/server/0482-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0483-Add-PrepareResultEvent.patch rename to patches/server/0482-Add-PrepareResultEvent.patch diff --git a/patches/server/0484-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0483-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0484-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0483-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0485-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0484-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/server/0485-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0484-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/server/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0485-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch similarity index 99% rename from patches/server/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch rename to patches/server/0485-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch index a384ae8aa..1ae75ad74 100644 --- a/patches/server/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch +++ b/patches/server/0485-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch @@ -361,7 +361,7 @@ index fe8e6d66665dc8c38e74c0b264cf507f99f83091..e317c73b430105052cbf28502916adc3 } }).exceptionally((throwable) -> { diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 2651c8161ee54a9085d43eceaeb6d16e8b693b25..6fd20a7ebca33f852933af6dbacd4065c1f4e30b 100644 +index daa13434cf4ba47f77b4f47c4d2ecb3d9d672031..ac848504fd7105506d6d733709ad05dc8b37c9d9 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -122,6 +122,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -1077,7 +1077,7 @@ index e5317a994cb9b30293ad54b8fc537f703ef994dc..eb6a802ea12a19a058fb7e23b7418b8b boolean flag1 = this.chunkMap.promoteChunkMap(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 009b6fe428db1a6e69403d8df32325f78e6b4461..1da049b171e26ac422fa0e56d8772577d5c768fa 100644 +index eb392fd936f0951c12d9ecfc3c557de14d112e8e..f1cd338942d709e3d2d8de40241fe6e14bcba062 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -189,6 +189,14 @@ public class ServerPlayer extends Player { @@ -1117,7 +1117,7 @@ index 009b6fe428db1a6e69403d8df32325f78e6b4461..1da049b171e26ac422fa0e56d8772577 // Yes, this doesn't match Vanilla, but it's the best we can do for now. // If this is an issue, PRs are welcome -@@ -646,6 +669,7 @@ public class ServerPlayer extends Player { +@@ -645,6 +668,7 @@ public class ServerPlayer extends Player { if (valid && !this.isSpectator() || !this.touchingUnloadedChunk()) { // Paper - don't tick dead players that are not in the world currently (pending respawn) super.tick(); } diff --git a/patches/server/0487-Improve-Chunk-Status-Transition-Speed.patch b/patches/server/0486-Improve-Chunk-Status-Transition-Speed.patch similarity index 95% rename from patches/server/0487-Improve-Chunk-Status-Transition-Speed.patch rename to patches/server/0486-Improve-Chunk-Status-Transition-Speed.patch index 2244d1b5b..36f01768f 100644 --- a/patches/server/0487-Improve-Chunk-Status-Transition-Speed.patch +++ b/patches/server/0486-Improve-Chunk-Status-Transition-Speed.patch @@ -36,7 +36,7 @@ scenario / path: Previously would have hopped to SERVER around 12+ times there extra. diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java -index 4550614bf0026677ae4389d64d4c2bfd7161ba02..e91552020b96d039c5516ddd8e85eadb8ab89c3c 100644 +index e317c73b430105052cbf28502916adc3bd60846b..96759f349e10c8ef634a11a6b48f9affae77d65a 100644 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java @@ -244,6 +244,13 @@ public class ChunkHolder { @@ -54,7 +54,7 @@ index 4550614bf0026677ae4389d64d4c2bfd7161ba02..e91552020b96d039c5516ddd8e85eadb 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 6fd20a7ebca33f852933af6dbacd4065c1f4e30b..91364805047c055a8755b7a2900988c750589ff7 100644 +index ac848504fd7105506d6d733709ad05dc8b37c9d9..2a85deeab49f32a897b53707d453d1a5f2972902 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -786,7 +786,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0488-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0487-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0488-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0487-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0489-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0488-Optimize-the-advancement-data-player-iteration-to-be.patch similarity index 100% rename from patches/server/0489-Optimize-the-advancement-data-player-iteration-to-be.patch rename to patches/server/0488-Optimize-the-advancement-data-player-iteration-to-be.patch diff --git a/patches/server/0490-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0489-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0490-Fix-arrows-never-despawning-MC-125757.patch rename to patches/server/0489-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0491-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0490-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0491-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/server/0490-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0492-Move-range-check-for-block-placing-up.patch b/patches/server/0491-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0492-Move-range-check-for-block-placing-up.patch rename to patches/server/0491-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0493-Fix-SPIGOT-5989.patch b/patches/server/0492-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0493-Fix-SPIGOT-5989.patch rename to patches/server/0492-Fix-SPIGOT-5989.patch diff --git a/patches/server/0494-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0493-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0494-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/server/0493-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0495-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0494-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0495-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/server/0494-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0496-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0495-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0496-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/server/0495-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0497-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0496-Add-missing-strikeLighting-call-to-World-spigot-stri.patch similarity index 100% rename from patches/server/0497-Add-missing-strikeLighting-call-to-World-spigot-stri.patch rename to patches/server/0496-Add-missing-strikeLighting-call-to-World-spigot-stri.patch diff --git a/patches/server/0498-Incremental-player-saving.patch b/patches/server/0497-Incremental-player-saving.patch similarity index 98% rename from patches/server/0498-Incremental-player-saving.patch rename to patches/server/0497-Incremental-player-saving.patch index 0e5026a98..7a7af4b7b 100644 --- a/patches/server/0498-Incremental-player-saving.patch +++ b/patches/server/0497-Incremental-player-saving.patch @@ -54,7 +54,7 @@ index c5f7510056cf4f0889d5470b1f1a444555c6ed75..47fbfe7cc1261d65264bb1897c57f72a } // Paper start for (ServerLevel level : this.getAllLevels()) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 1da049b171e26ac422fa0e56d8772577d5c768fa..9015c0e6f277b299a55cd772cc7cf405421f6622 100644 +index f1cd338942d709e3d2d8de40241fe6e14bcba062..d4ab5061026eaff96b917427fd278ae06e103c6d 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -175,6 +175,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0499-Fix-some-rails-connecting-improperly.patch b/patches/server/0498-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0499-Fix-some-rails-connecting-improperly.patch rename to patches/server/0498-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0500-Fix-MC-187716-Use-configured-height.patch b/patches/server/0499-Fix-MC-187716-Use-configured-height.patch similarity index 100% rename from patches/server/0500-Fix-MC-187716-Use-configured-height.patch rename to patches/server/0499-Fix-MC-187716-Use-configured-height.patch diff --git a/patches/server/0501-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0500-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0501-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0500-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0502-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0501-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0502-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0501-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0503-Brand-support.patch b/patches/server/0502-Brand-support.patch similarity index 100% rename from patches/server/0503-Brand-support.patch rename to patches/server/0502-Brand-support.patch diff --git a/patches/server/0504-Add-setMaxPlayers-API.patch b/patches/server/0503-Add-setMaxPlayers-API.patch similarity index 100% rename from patches/server/0504-Add-setMaxPlayers-API.patch rename to patches/server/0503-Add-setMaxPlayers-API.patch diff --git a/patches/server/0505-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0504-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0505-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0504-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0506-Don-t-require-FACING-data.patch b/patches/server/0505-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0506-Don-t-require-FACING-data.patch rename to patches/server/0505-Don-t-require-FACING-data.patch diff --git a/patches/server/0507-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0506-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/0507-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0506-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/0508-Add-moon-phase-API.patch b/patches/server/0507-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0508-Add-moon-phase-API.patch rename to patches/server/0507-Add-moon-phase-API.patch diff --git a/patches/server/0509-Prevent-headless-pistons-from-being-created.patch b/patches/server/0508-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0509-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0508-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0510-Add-BellRingEvent.patch b/patches/server/0509-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0510-Add-BellRingEvent.patch rename to patches/server/0509-Add-BellRingEvent.patch diff --git a/patches/server/0511-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0510-Add-zombie-targets-turtle-egg-config.patch similarity index 95% rename from patches/server/0511-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0510-Add-zombie-targets-turtle-egg-config.patch index 66f7d8090..e1b6ac16d 100644 --- a/patches/server/0511-Add-zombie-targets-turtle-egg-config.patch +++ b/patches/server/0510-Add-zombie-targets-turtle-egg-config.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add zombie targets turtle egg config diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 7ac92d856d67046a6928e8cd21a57760d4b4954c..5d47b6bce004c21293b66a6e2a4095299e196546 100644 +index 144a8d424cd4f953b1471f20d1521ed1b7639f1a..ee8a1be2fa90f4503f90a2690713de234479de9d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -38,6 +38,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0512-Buffer-joins-to-world.patch b/patches/server/0511-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0512-Buffer-joins-to-world.patch rename to patches/server/0511-Buffer-joins-to-world.patch diff --git a/patches/server/0513-Optimize-redstone-algorithm.patch b/patches/server/0512-Optimize-redstone-algorithm.patch similarity index 99% rename from patches/server/0513-Optimize-redstone-algorithm.patch rename to patches/server/0512-Optimize-redstone-algorithm.patch index 4c4158323..141b2ee1b 100644 --- a/patches/server/0513-Optimize-redstone-algorithm.patch +++ b/patches/server/0512-Optimize-redstone-algorithm.patch @@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee Just added Bukkit's event system and took a few liberties with dead code and comment misspellings. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 5d47b6bce004c21293b66a6e2a4095299e196546..e04034003a830c9eb65b9dc18949e5a5cb94257c 100644 +index ee8a1be2fa90f4503f90a2690713de234479de9d..b114b60266f4f29f243d09fe9ea3df2082fd0d6c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -43,6 +43,16 @@ public class PaperWorldConfig { diff --git a/patches/server/0514-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0513-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0514-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0513-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0515-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0514-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0515-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0514-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0516-Fix-CraftTeam-null-check.patch b/patches/server/0515-Fix-CraftTeam-null-check.patch similarity index 100% rename from patches/server/0516-Fix-CraftTeam-null-check.patch rename to patches/server/0515-Fix-CraftTeam-null-check.patch diff --git a/patches/server/0517-Add-more-Evoker-API.patch b/patches/server/0516-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0517-Add-more-Evoker-API.patch rename to patches/server/0516-Add-more-Evoker-API.patch diff --git a/patches/server/0518-Add-methods-to-get-translation-keys.patch b/patches/server/0517-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0518-Add-methods-to-get-translation-keys.patch rename to patches/server/0517-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0519-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0518-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0519-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0518-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0520-Cache-block-data-strings.patch b/patches/server/0519-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0520-Cache-block-data-strings.patch rename to patches/server/0519-Cache-block-data-strings.patch diff --git a/patches/server/0521-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0520-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 100% rename from patches/server/0521-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/server/0520-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch diff --git a/patches/server/0522-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0521-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/0522-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/server/0521-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/0523-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0522-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0523-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/server/0522-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0524-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0523-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 96% rename from patches/server/0524-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/server/0523-Extend-block-drop-capture-to-capture-all-items-added.patch index 85ed04e35..beff1740a 100644 --- a/patches/server/0524-Extend-block-drop-capture-to-capture-all-items-added.patch +++ b/patches/server/0523-Extend-block-drop-capture-to-capture-all-items-added.patch @@ -24,7 +24,7 @@ index 1b13c67441c46208a9b2adde5ca109f90bbb92e2..3563690e404a68b8940d9c06a0198dd0 return false; } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 81275857101522b2bb8824313159744036a1cc4f..2fb45e48cc5845c71cca21c43bb012f3eb6a0b53 100644 +index 784e6c2db5bb346408948cff8ac3cc9b964dd6d8..0b274a5b9e0bf68769637f10e43dbff6d909512b 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -7,6 +7,7 @@ import net.minecraft.world.InteractionResult; diff --git a/patches/server/0525-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0524-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch similarity index 89% rename from patches/server/0525-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch rename to patches/server/0524-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch index 8243a5a2c..a08e40692 100644 --- a/patches/server/0525-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch +++ b/patches/server/0524-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't mark dirty in invalid locations (SPIGOT-6086) diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java -index e91552020b96d039c5516ddd8e85eadb8ab89c3c..7bf3dd705460c996fb4b575957f87805edb13ba4 100644 +index 96759f349e10c8ef634a11a6b48f9affae77d65a..823451570e02ee75bfce1c106779a0502187fcea 100644 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java @@ -381,6 +381,7 @@ public class ChunkHolder { diff --git a/patches/server/0526-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0525-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/server/0526-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/server/0525-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/server/0527-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0526-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0527-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/server/0526-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0528-Entity-isTicking.patch b/patches/server/0527-Entity-isTicking.patch similarity index 100% rename from patches/server/0528-Entity-isTicking.patch rename to patches/server/0527-Entity-isTicking.patch diff --git a/patches/server/0529-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0528-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0529-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/server/0528-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0530-Fix-Concurrency-issue-in-WeightedList.patch b/patches/server/0529-Fix-Concurrency-issue-in-WeightedList.patch similarity index 100% rename from patches/server/0530-Fix-Concurrency-issue-in-WeightedList.patch rename to patches/server/0529-Fix-Concurrency-issue-in-WeightedList.patch diff --git a/patches/server/0531-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0530-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0531-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0530-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0532-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0531-Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from patches/server/0532-Fix-for-large-move-vectors-crashing-server.patch rename to patches/server/0531-Fix-for-large-move-vectors-crashing-server.patch diff --git a/patches/server/0533-Optimise-getType-calls.patch b/patches/server/0532-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0533-Optimise-getType-calls.patch rename to patches/server/0532-Optimise-getType-calls.patch diff --git a/patches/server/0534-Villager-resetOffers.patch b/patches/server/0533-Villager-resetOffers.patch similarity index 100% rename from patches/server/0534-Villager-resetOffers.patch rename to patches/server/0533-Villager-resetOffers.patch diff --git a/patches/server/0535-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0534-Improve-inlinig-for-some-hot-IBlockData-methods.patch similarity index 100% rename from patches/server/0535-Improve-inlinig-for-some-hot-IBlockData-methods.patch rename to patches/server/0534-Improve-inlinig-for-some-hot-IBlockData-methods.patch diff --git a/patches/server/0536-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0535-Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from patches/server/0536-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/server/0535-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/patches/server/0537-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0536-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0537-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/server/0536-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0538-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0537-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0538-Fix-item-locations-dropped-from-campfires.patch rename to patches/server/0537-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0539-Player-elytra-boost-API.patch b/patches/server/0538-Player-elytra-boost-API.patch similarity index 100% rename from patches/server/0539-Player-elytra-boost-API.patch rename to patches/server/0538-Player-elytra-boost-API.patch diff --git a/patches/server/0540-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0539-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/0540-Fixed-TileEntityBell-memory-leak.patch rename to patches/server/0539-Fixed-TileEntityBell-memory-leak.patch diff --git a/patches/server/0541-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0540-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0541-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/server/0540-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0542-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0541-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/0542-Add-getOfflinePlayerIfCached-String.patch rename to patches/server/0541-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/0543-Add-ignore-discounts-API.patch b/patches/server/0542-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0543-Add-ignore-discounts-API.patch rename to patches/server/0542-Add-ignore-discounts-API.patch diff --git a/patches/server/0544-Toggle-for-removing-existing-dragon.patch b/patches/server/0543-Toggle-for-removing-existing-dragon.patch similarity index 95% rename from patches/server/0544-Toggle-for-removing-existing-dragon.patch rename to patches/server/0543-Toggle-for-removing-existing-dragon.patch index 2797e92c0..5659347fe 100644 --- a/patches/server/0544-Toggle-for-removing-existing-dragon.patch +++ b/patches/server/0543-Toggle-for-removing-existing-dragon.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Toggle for removing existing dragon diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index e04034003a830c9eb65b9dc18949e5a5cb94257c..3ded902cd23ac022d23941987c779980d5a9af7d 100644 +index b114b60266f4f29f243d09fe9ea3df2082fd0d6c..b5ede8b54261753b09f770428e9bf23f356bb8ea 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -53,6 +53,14 @@ public class PaperWorldConfig { diff --git a/patches/server/0545-Fix-client-lag-on-advancement-loading.patch b/patches/server/0544-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0545-Fix-client-lag-on-advancement-loading.patch rename to patches/server/0544-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0546-Item-no-age-no-player-pickup.patch b/patches/server/0545-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0546-Item-no-age-no-player-pickup.patch rename to patches/server/0545-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0547-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0546-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/0547-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/0546-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/0548-Beacon-API-custom-effect-ranges.patch b/patches/server/0547-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0548-Beacon-API-custom-effect-ranges.patch rename to patches/server/0547-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0549-Add-API-for-quit-reason.patch b/patches/server/0548-Add-API-for-quit-reason.patch similarity index 98% rename from patches/server/0549-Add-API-for-quit-reason.patch rename to patches/server/0548-Add-API-for-quit-reason.patch index f62269879..f21914428 100644 --- a/patches/server/0549-Add-API-for-quit-reason.patch +++ b/patches/server/0548-Add-API-for-quit-reason.patch @@ -25,7 +25,7 @@ index 7f6405ac44fef423dc8b21f3dbeaae26a1005077..bdd4f4db9849d9107b5c62d5e83b1277 Connection.LOGGER.debug("Failed to sent packet", throwable); ConnectionProtocol enumprotocol = this.getCurrentProtocol(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 9015c0e6f277b299a55cd772cc7cf405421f6622..6280452d981a9409ed84a72f7ebb572bd7660c9c 100644 +index d4ab5061026eaff96b917427fd278ae06e103c6d..ed1076e7d9ea9fd0e2e7504726b21bf2cbe7e151 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -262,6 +262,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0550-Seed-based-feature-search.patch b/patches/server/0549-Seed-based-feature-search.patch similarity index 100% rename from patches/server/0550-Seed-based-feature-search.patch rename to patches/server/0549-Seed-based-feature-search.patch diff --git a/patches/server/0551-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0550-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 98% rename from patches/server/0551-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0550-Add-Wandering-Trader-spawn-rate-config-options.patch index dafea2624..3ed874db7 100644 --- a/patches/server/0551-Add-Wandering-Trader-spawn-rate-config-options.patch +++ b/patches/server/0550-Add-Wandering-Trader-spawn-rate-config-options.patch @@ -11,7 +11,7 @@ in IWorldServerData are removed as they were only used in certain places, with h values used in other places. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 4880bb961c8bf87dd4e5538c091826b6be1a0e19..b3c29c9796eafc220d7838ba2add9c8d81ba4659 100644 +index a2dfbb2380b468b0ae41c01039a949a58bb49550..ccdc2be5957e74fbfdcbd56efe3ec85a2fa0b0d7 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -61,6 +61,19 @@ public class PaperWorldConfig { diff --git a/patches/server/0552-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0551-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0552-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0551-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0553-Expose-world-spawn-angle.patch b/patches/server/0552-Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/0553-Expose-world-spawn-angle.patch rename to patches/server/0552-Expose-world-spawn-angle.patch diff --git a/patches/server/0554-Add-Destroy-Speed-API.patch b/patches/server/0553-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0554-Add-Destroy-Speed-API.patch rename to patches/server/0553-Add-Destroy-Speed-API.patch diff --git a/patches/server/0555-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0554-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0555-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0554-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0556-Add-LivingEntity-clearActiveItem.patch b/patches/server/0555-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0556-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0555-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0557-Add-PlayerItemCooldownEvent.patch b/patches/server/0556-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0557-Add-PlayerItemCooldownEvent.patch rename to patches/server/0556-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0558-More-lightning-API.patch b/patches/server/0557-More-lightning-API.patch similarity index 100% rename from patches/server/0558-More-lightning-API.patch rename to patches/server/0557-More-lightning-API.patch diff --git a/patches/server/0559-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0558-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 98% rename from patches/server/0559-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0558-Climbing-should-not-bypass-cramming-gamerule.patch index 945f08fd7..91b069c5d 100644 --- a/patches/server/0559-Climbing-should-not-bypass-cramming-gamerule.patch +++ b/patches/server/0558-Climbing-should-not-bypass-cramming-gamerule.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index b3c29c9796eafc220d7838ba2add9c8d81ba4659..c76d4716ee7fdc846c9e91b2bf6a7df6bff03744 100644 +index ccdc2be5957e74fbfdcbd56efe3ec85a2fa0b0d7..5267c958ce8e70dcdbf30c7db42e9af7c4a89e0f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -74,6 +74,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0560-Added-missing-default-perms-for-commands.patch b/patches/server/0559-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0560-Added-missing-default-perms-for-commands.patch rename to patches/server/0559-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0561-Add-PlayerShearBlockEvent.patch b/patches/server/0560-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0561-Add-PlayerShearBlockEvent.patch rename to patches/server/0560-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0562-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0561-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/0562-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/server/0561-Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/0563-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0562-Fix-curing-zombie-villager-discount-exploit.patch similarity index 96% rename from patches/server/0563-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/server/0562-Fix-curing-zombie-villager-discount-exploit.patch index b8c4276e2..032b912f1 100644 --- a/patches/server/0563-Fix-curing-zombie-villager-discount-exploit.patch +++ b/patches/server/0562-Fix-curing-zombie-villager-discount-exploit.patch @@ -8,7 +8,7 @@ and curing a villager on repeat by simply resetting the relevant part of the reputation when it is cured. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index c76d4716ee7fdc846c9e91b2bf6a7df6bff03744..37deb2be7ec11d9f57ee92123e6815398a195ddc 100644 +index 5267c958ce8e70dcdbf30c7db42e9af7c4a89e0f..d1cd007032abf3073ea4ee0e61ce0995addf40dd 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -79,6 +79,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0564-Limit-recipe-packets.patch b/patches/server/0563-Limit-recipe-packets.patch similarity index 100% rename from patches/server/0564-Limit-recipe-packets.patch rename to patches/server/0563-Limit-recipe-packets.patch diff --git a/patches/server/0565-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0564-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0565-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0564-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0566-MC-4-Fix-item-position-desync.patch b/patches/server/0565-MC-4-Fix-item-position-desync.patch similarity index 100% rename from patches/server/0566-MC-4-Fix-item-position-desync.patch rename to patches/server/0565-MC-4-Fix-item-position-desync.patch diff --git a/patches/server/0567-Player-Chunk-Load-Unload-Events.patch b/patches/server/0566-Player-Chunk-Load-Unload-Events.patch similarity index 90% rename from patches/server/0567-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0566-Player-Chunk-Load-Unload-Events.patch index e08555566..17c17789e 100644 --- a/patches/server/0567-Player-Chunk-Load-Unload-Events.patch +++ b/patches/server/0566-Player-Chunk-Load-Unload-Events.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Player Chunk Load/Unload Events diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 6280452d981a9409ed84a72f7ebb572bd7660c9c..8ca66198f3d2ef120f14d6398a02b7ebf8a6a8df 100644 +index ed1076e7d9ea9fd0e2e7504726b21bf2cbe7e151..92f16e89d19543725f64cbcbd2db5fcf507ea51a 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2096,11 +2096,21 @@ public class ServerPlayer extends Player { +@@ -2095,11 +2095,21 @@ public class ServerPlayer extends Player { public void trackChunk(ChunkPos chunkPos, Packet chunkDataPacket, Packet lightUpdatePacket) { this.connection.send(lightUpdatePacket); this.connection.send(chunkDataPacket); diff --git a/patches/server/0568-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0567-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0568-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0567-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0569-Expose-LivingEntity-hurt-direction.patch b/patches/server/0568-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0569-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0568-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0570-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0569-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0570-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0569-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0571-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0570-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0571-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0570-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0572-added-PlayerTradeEvent.patch b/patches/server/0571-added-PlayerTradeEvent.patch similarity index 100% rename from patches/server/0572-added-PlayerTradeEvent.patch rename to patches/server/0571-added-PlayerTradeEvent.patch diff --git a/patches/server/0573-Implement-TargetHitEvent.patch b/patches/server/0572-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0573-Implement-TargetHitEvent.patch rename to patches/server/0572-Implement-TargetHitEvent.patch diff --git a/patches/server/0574-Additional-Block-Material-API-s.patch b/patches/server/0573-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0574-Additional-Block-Material-API-s.patch rename to patches/server/0573-Additional-Block-Material-API-s.patch diff --git a/patches/server/0575-Fix-harming-potion-dupe.patch b/patches/server/0574-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0575-Fix-harming-potion-dupe.patch rename to patches/server/0574-Fix-harming-potion-dupe.patch diff --git a/patches/server/0576-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0575-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0576-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0575-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0577-Cache-burn-durations.patch b/patches/server/0576-Cache-burn-durations.patch similarity index 100% rename from patches/server/0577-Cache-burn-durations.patch rename to patches/server/0576-Cache-burn-durations.patch diff --git a/patches/server/0578-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0577-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 95% rename from patches/server/0578-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0577-Allow-disabling-mob-spawner-spawn-egg-transformation.patch index df3dcd0a8..8e7b3e278 100644 --- a/patches/server/0578-Allow-disabling-mob-spawner-spawn-egg-transformation.patch +++ b/patches/server/0577-Allow-disabling-mob-spawner-spawn-egg-transformation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow disabling mob spawner spawn egg transformation diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 37deb2be7ec11d9f57ee92123e6815398a195ddc..0b8f85f8f3bd5ac236049f32a5015476eab57069 100644 +index d1cd007032abf3073ea4ee0e61ce0995addf40dd..e81325c323d2e07fab4f3db2c812a08549453760 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -84,6 +84,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0579-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0578-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0579-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0578-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0580-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0579-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0580-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0579-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0581-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0580-Fix-interact-event-not-being-called-in-adventure.patch similarity index 100% rename from patches/server/0581-Fix-interact-event-not-being-called-in-adventure.patch rename to patches/server/0580-Fix-interact-event-not-being-called-in-adventure.patch diff --git a/patches/server/0582-Zombie-API-breaking-doors.patch b/patches/server/0581-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0582-Zombie-API-breaking-doors.patch rename to patches/server/0581-Zombie-API-breaking-doors.patch diff --git a/patches/server/0583-Fix-nerfed-slime-when-splitting.patch b/patches/server/0582-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0583-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0582-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0584-Add-EntityLoadCrossbowEvent.patch b/patches/server/0583-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0584-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0583-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0585-Guardian-beam-workaround.patch b/patches/server/0584-Guardian-beam-workaround.patch similarity index 100% rename from patches/server/0585-Guardian-beam-workaround.patch rename to patches/server/0584-Guardian-beam-workaround.patch diff --git a/patches/server/0586-Added-WorldGameRuleChangeEvent.patch b/patches/server/0585-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0586-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0585-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0587-Added-ServerResourcesReloadedEvent.patch b/patches/server/0586-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0587-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0586-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0588-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0587-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0588-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0587-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0589-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0588-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0589-Implemented-BlockFailedDispenseEvent.patch rename to patches/server/0588-Implemented-BlockFailedDispenseEvent.patch diff --git a/patches/server/0590-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0589-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0590-Added-PlayerLecternPageChangeEvent.patch rename to patches/server/0589-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0591-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0590-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0591-Added-PlayerLoomPatternSelectEvent.patch rename to patches/server/0590-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0592-Configurable-door-breaking-difficulty.patch b/patches/server/0591-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0592-Configurable-door-breaking-difficulty.patch rename to patches/server/0591-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0593-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0592-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0593-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0592-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0594-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0593-Implement-API-to-expose-exact-interaction-point.patch similarity index 97% rename from patches/server/0594-Implement-API-to-expose-exact-interaction-point.patch rename to patches/server/0593-Implement-API-to-expose-exact-interaction-point.patch index 23f7ae9f2..373ddafce 100644 --- a/patches/server/0594-Implement-API-to-expose-exact-interaction-point.patch +++ b/patches/server/0593-Implement-API-to-expose-exact-interaction-point.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement API to expose exact interaction point diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 2fb45e48cc5845c71cca21c43bb012f3eb6a0b53..5ef649dec31ba6d6b74a7bd757727ffd2a79d71e 100644 +index 0b274a5b9e0bf68769637f10e43dbff6d909512b..da2ae74b6f5875200e22c42ed07431016a90845e 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -501,7 +501,7 @@ public class ServerPlayerGameMode { diff --git a/patches/server/0595-Remove-stale-POIs.patch b/patches/server/0594-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0595-Remove-stale-POIs.patch rename to patches/server/0594-Remove-stale-POIs.patch diff --git a/patches/server/0596-Fix-villager-boat-exploit.patch b/patches/server/0595-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0596-Fix-villager-boat-exploit.patch rename to patches/server/0595-Fix-villager-boat-exploit.patch diff --git a/patches/server/0597-Add-sendOpLevel-API.patch b/patches/server/0596-Add-sendOpLevel-API.patch similarity index 100% rename from patches/server/0597-Add-sendOpLevel-API.patch rename to patches/server/0596-Add-sendOpLevel-API.patch diff --git a/patches/server/0598-Add-StructureLocateEvent.patch b/patches/server/0597-Add-StructureLocateEvent.patch similarity index 100% rename from patches/server/0598-Add-StructureLocateEvent.patch rename to patches/server/0597-Add-StructureLocateEvent.patch diff --git a/patches/server/0599-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0598-Collision-option-for-requiring-a-player-participant.patch similarity index 98% rename from patches/server/0599-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0598-Collision-option-for-requiring-a-player-participant.patch index 94d6449bd..804eb4c63 100644 --- a/patches/server/0599-Collision-option-for-requiring-a-player-participant.patch +++ b/patches/server/0598-Collision-option-for-requiring-a-player-participant.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Collision option for requiring a player participant diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 7f97fae63f2e7c9ffbd0b971a985a041d8f49dd4..99ab8494f4b61c0729a0c27ee4640174638740d0 100644 +index 59302ef7db7dbda7889981ca87fa310d8dc74e8f..1c6cca5452a2635509003b6daba30605d3433d88 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -64,6 +64,18 @@ public class PaperWorldConfig { diff --git a/patches/server/0600-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0599-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0600-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0599-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0601-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0600-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0601-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0600-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0602-Make-schedule-command-per-world.patch b/patches/server/0601-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0602-Make-schedule-command-per-world.patch rename to patches/server/0601-Make-schedule-command-per-world.patch diff --git a/patches/server/0603-Configurable-max-leash-distance.patch b/patches/server/0602-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0603-Configurable-max-leash-distance.patch rename to patches/server/0602-Configurable-max-leash-distance.patch diff --git a/patches/server/0604-Implement-BlockPreDispenseEvent.patch b/patches/server/0603-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0604-Implement-BlockPreDispenseEvent.patch rename to patches/server/0603-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0605-Added-Vanilla-Entity-Tags.patch b/patches/server/0604-Added-Vanilla-Entity-Tags.patch similarity index 100% rename from patches/server/0605-Added-Vanilla-Entity-Tags.patch rename to patches/server/0604-Added-Vanilla-Entity-Tags.patch diff --git a/patches/server/0606-added-Wither-API.patch b/patches/server/0605-added-Wither-API.patch similarity index 100% rename from patches/server/0606-added-Wither-API.patch rename to patches/server/0605-added-Wither-API.patch diff --git a/patches/server/0607-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0606-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0607-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0606-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0608-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0607-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0608-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0607-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0609-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0608-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0609-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0608-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0610-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0609-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0610-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0609-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0611-Skip-distance-map-update-when-spawning-disabled.patch b/patches/server/0610-Skip-distance-map-update-when-spawning-disabled.patch similarity index 100% rename from patches/server/0611-Skip-distance-map-update-when-spawning-disabled.patch rename to patches/server/0610-Skip-distance-map-update-when-spawning-disabled.patch diff --git a/patches/server/0612-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0611-Reset-shield-blocking-on-dimension-change.patch similarity index 83% rename from patches/server/0612-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0611-Reset-shield-blocking-on-dimension-change.patch index 47abedd2c..490f3322d 100644 --- a/patches/server/0612-Reset-shield-blocking-on-dimension-change.patch +++ b/patches/server/0611-Reset-shield-blocking-on-dimension-change.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Reset shield blocking on dimension change diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 8ca66198f3d2ef120f14d6398a02b7ebf8a6a8df..acd8af785067caec8b40b7517a76fa1d9b967e63 100644 +index 92f16e89d19543725f64cbcbd2db5fcf507ea51a..d044ceb467621f3ddc2fd1471648d03fe4e1ec85 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1144,6 +1144,11 @@ public class ServerPlayer extends Player { +@@ -1143,6 +1143,11 @@ public class ServerPlayer extends Player { this.level.getCraftServer().getPluginManager().callEvent(changeEvent); // CraftBukkit end } diff --git a/patches/server/0613-add-DragonEggFormEvent.patch b/patches/server/0612-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0613-add-DragonEggFormEvent.patch rename to patches/server/0612-add-DragonEggFormEvent.patch diff --git a/patches/server/0614-EntityMoveEvent.patch b/patches/server/0613-EntityMoveEvent.patch similarity index 100% rename from patches/server/0614-EntityMoveEvent.patch rename to patches/server/0613-EntityMoveEvent.patch diff --git a/patches/server/0615-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0614-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0615-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0614-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0616-Inline-shift-direction-fields.patch b/patches/server/0615-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0616-Inline-shift-direction-fields.patch rename to patches/server/0615-Inline-shift-direction-fields.patch diff --git a/patches/server/0617-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0616-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0617-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0616-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0618-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0617-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0618-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0617-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0619-living-entity-allow-attribute-registration.patch b/patches/server/0618-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0619-living-entity-allow-attribute-registration.patch rename to patches/server/0618-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0620-fix-dead-slime-setSize-invincibility.patch b/patches/server/0619-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0620-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0619-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0621-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0620-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0621-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0620-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0622-misc-debugging-dumps.patch b/patches/server/0621-misc-debugging-dumps.patch similarity index 100% rename from patches/server/0622-misc-debugging-dumps.patch rename to patches/server/0621-misc-debugging-dumps.patch diff --git a/patches/server/0623-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0622-Add-support-for-hex-color-codes-in-console.patch similarity index 100% rename from patches/server/0623-Add-support-for-hex-color-codes-in-console.patch rename to patches/server/0622-Add-support-for-hex-color-codes-in-console.patch diff --git a/patches/server/0624-Expose-Tracked-Players.patch b/patches/server/0623-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0624-Expose-Tracked-Players.patch rename to patches/server/0623-Expose-Tracked-Players.patch diff --git a/patches/server/0625-Remove-streams-from-SensorNearest.patch b/patches/server/0624-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0625-Remove-streams-from-SensorNearest.patch rename to patches/server/0624-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0626-MC-29274-Fix-Wither-hostility-towards-players.patch b/patches/server/0625-MC-29274-Fix-Wither-hostility-towards-players.patch similarity index 100% rename from patches/server/0626-MC-29274-Fix-Wither-hostility-towards-players.patch rename to patches/server/0625-MC-29274-Fix-Wither-hostility-towards-players.patch diff --git a/patches/server/0627-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0626-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/0627-Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/server/0626-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/0628-Improve-ServerGUI.patch b/patches/server/0627-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0628-Improve-ServerGUI.patch rename to patches/server/0627-Improve-ServerGUI.patch diff --git a/patches/server/0629-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0628-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch similarity index 100% rename from patches/server/0629-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch rename to patches/server/0628-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch diff --git a/patches/server/0630-fix-converting-txt-to-json-file.patch b/patches/server/0629-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0630-fix-converting-txt-to-json-file.patch rename to patches/server/0629-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0631-Add-worldborder-events.patch b/patches/server/0630-Add-worldborder-events.patch similarity index 100% rename from patches/server/0631-Add-worldborder-events.patch rename to patches/server/0630-Add-worldborder-events.patch diff --git a/patches/server/0632-added-PlayerNameEntityEvent.patch b/patches/server/0631-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0632-added-PlayerNameEntityEvent.patch rename to patches/server/0631-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0633-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0632-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0633-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0632-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0634-Add-recipe-to-cook-events.patch b/patches/server/0633-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0634-Add-recipe-to-cook-events.patch rename to patches/server/0633-Add-recipe-to-cook-events.patch diff --git a/patches/server/0635-Add-Block-isValidTool.patch b/patches/server/0634-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0635-Add-Block-isValidTool.patch rename to patches/server/0634-Add-Block-isValidTool.patch diff --git a/patches/server/0636-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0635-Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/0636-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0635-Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/0637-Implement-Keyed-on-World.patch b/patches/server/0636-Implement-Keyed-on-World.patch similarity index 100% rename from patches/server/0637-Implement-Keyed-on-World.patch rename to patches/server/0636-Implement-Keyed-on-World.patch diff --git a/patches/server/0638-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0637-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0638-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0637-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0639-Item-Rarity-API.patch b/patches/server/0638-Item-Rarity-API.patch similarity index 100% rename from patches/server/0639-Item-Rarity-API.patch rename to patches/server/0638-Item-Rarity-API.patch diff --git a/patches/server/0640-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0639-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0640-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0639-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0641-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0640-copy-TESign-isEditable-from-snapshots.patch similarity index 100% rename from patches/server/0641-copy-TESign-isEditable-from-snapshots.patch rename to patches/server/0640-copy-TESign-isEditable-from-snapshots.patch diff --git a/patches/server/0642-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0641-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0642-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0641-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0643-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0642-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0643-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0642-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0644-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0643-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0644-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0643-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0645-Entity-load-save-limit-per-chunk.patch b/patches/server/0644-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0645-Entity-load-save-limit-per-chunk.patch rename to patches/server/0644-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0646-fix-cancelling-block-falling-causing-client-desync.patch b/patches/server/0645-fix-cancelling-block-falling-causing-client-desync.patch similarity index 100% rename from patches/server/0646-fix-cancelling-block-falling-causing-client-desync.patch rename to patches/server/0645-fix-cancelling-block-falling-causing-client-desync.patch diff --git a/patches/server/0647-Expose-protocol-version.patch b/patches/server/0646-Expose-protocol-version.patch similarity index 100% rename from patches/server/0647-Expose-protocol-version.patch rename to patches/server/0646-Expose-protocol-version.patch diff --git a/patches/server/0648-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0647-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch similarity index 100% rename from patches/server/0648-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch rename to patches/server/0647-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch diff --git a/patches/server/0649-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0648-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0649-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0648-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0650-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0649-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0650-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0649-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0651-Add-bypass-host-check.patch b/patches/server/0650-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0651-Add-bypass-host-check.patch rename to patches/server/0650-Add-bypass-host-check.patch diff --git a/patches/server/0652-Set-area-affect-cloud-rotation.patch b/patches/server/0651-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0652-Set-area-affect-cloud-rotation.patch rename to patches/server/0651-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0653-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0652-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0653-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0652-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0654-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0653-Fix-duplicating-give-items-on-item-drop-cancel.patch similarity index 100% rename from patches/server/0654-Fix-duplicating-give-items-on-item-drop-cancel.patch rename to patches/server/0653-Fix-duplicating-give-items-on-item-drop-cancel.patch diff --git a/patches/server/0655-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0654-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0655-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0654-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0656-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0655-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0656-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0655-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0657-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0656-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0657-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0656-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0658-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0657-Fix-checkReach-check-for-Shulker-boxes.patch similarity index 100% rename from patches/server/0658-Fix-checkReach-check-for-Shulker-boxes.patch rename to patches/server/0657-Fix-checkReach-check-for-Shulker-boxes.patch diff --git a/patches/server/0659-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0658-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/0659-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0658-fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/0660-Added-PlayerDeepSleepEvent.patch b/patches/server/0659-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0660-Added-PlayerDeepSleepEvent.patch rename to patches/server/0659-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0661-More-World-API.patch b/patches/server/0660-More-World-API.patch similarity index 100% rename from patches/server/0661-More-World-API.patch rename to patches/server/0660-More-World-API.patch diff --git a/patches/server/0662-Added-PlayerBedFailEnterEvent.patch b/patches/server/0661-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0662-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0661-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0663-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0662-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0663-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0662-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0664-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0663-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0664-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0663-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0665-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0664-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0665-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0664-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0666-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0665-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/server/0666-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0665-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/server/0667-Add-Channel-initialization-listeners.patch b/patches/server/0666-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0667-Add-Channel-initialization-listeners.patch rename to patches/server/0666-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0668-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0667-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0668-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0667-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0669-Add-more-WanderingTrader-API.patch b/patches/server/0668-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0669-Add-more-WanderingTrader-API.patch rename to patches/server/0668-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0670-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0669-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0670-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0669-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0671-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0670-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0671-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0670-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0672-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0671-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0672-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0671-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0673-Inventory-close.patch b/patches/server/0672-Inventory-close.patch similarity index 100% rename from patches/server/0673-Inventory-close.patch rename to patches/server/0672-Inventory-close.patch diff --git a/patches/server/0674-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0673-call-PortalCreateEvent-players-and-end-platform.patch similarity index 91% rename from patches/server/0674-call-PortalCreateEvent-players-and-end-platform.patch rename to patches/server/0673-call-PortalCreateEvent-players-and-end-platform.patch index dddece21a..839e56fa6 100644 --- a/patches/server/0674-call-PortalCreateEvent-players-and-end-platform.patch +++ b/patches/server/0673-call-PortalCreateEvent-players-and-end-platform.patch @@ -5,10 +5,10 @@ Subject: [PATCH] call PortalCreateEvent players and end platform diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index acd8af785067caec8b40b7517a76fa1d9b967e63..a67b5fc55e769d46c8f6f395725d3d8198dcb5c6 100644 +index d044ceb467621f3ddc2fd1471648d03fe4e1ec85..f388b75e6d7fc726349435f86308ae729144343a 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1171,15 +1171,21 @@ public class ServerPlayer extends Player { +@@ -1170,15 +1170,21 @@ public class ServerPlayer extends Player { private void createEndPlatform(ServerLevel world, BlockPos centerPos) { BlockPos.MutableBlockPos blockposition_mutableblockposition = centerPos.mutable(); diff --git a/patches/server/0675-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0674-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0675-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0674-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0676-Fix-CraftPotionBrewer-cache.patch b/patches/server/0675-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0676-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0675-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0677-Add-basic-Datapack-API.patch b/patches/server/0676-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0677-Add-basic-Datapack-API.patch rename to patches/server/0676-Add-basic-Datapack-API.patch diff --git a/patches/server/0678-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0677-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0678-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0677-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0679-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0678-additions-to-PlayerGameModeChangeEvent.patch similarity index 95% rename from patches/server/0679-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0678-additions-to-PlayerGameModeChangeEvent.patch index 6c5dd8a9c..991c3c97a 100644 --- a/patches/server/0679-additions-to-PlayerGameModeChangeEvent.patch +++ b/patches/server/0678-additions-to-PlayerGameModeChangeEvent.patch @@ -45,10 +45,10 @@ index d75f78d2e3fb1376e8f6a8668c98a04a693c99e1..79f6089b934124c3309c6bee2e48b36b } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a67b5fc55e769d46c8f6f395725d3d8198dcb5c6..4c0eef82969f4666ad7e30db5e174fdeb396e644 100644 +index f388b75e6d7fc726349435f86308ae729144343a..742ebd3c3abec18a274ab85d1a9e8ad5fa442ccb 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1792,8 +1792,15 @@ public class ServerPlayer extends Player { +@@ -1791,8 +1791,15 @@ public class ServerPlayer extends Player { } public boolean setGameMode(GameType gameMode) { @@ -66,7 +66,7 @@ index a67b5fc55e769d46c8f6f395725d3d8198dcb5c6..4c0eef82969f4666ad7e30db5e174fde } else { this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, (float) gameMode.getId())); if (gameMode == GameType.SPECTATOR) { -@@ -1805,7 +1812,7 @@ public class ServerPlayer extends Player { +@@ -1804,7 +1811,7 @@ public class ServerPlayer extends Player { this.onUpdateAbilities(); this.updateEffectVisibility(); @@ -75,7 +75,7 @@ index a67b5fc55e769d46c8f6f395725d3d8198dcb5c6..4c0eef82969f4666ad7e30db5e174fde } } -@@ -2187,6 +2194,16 @@ public class ServerPlayer extends Player { +@@ -2186,6 +2193,16 @@ public class ServerPlayer extends Player { } public void loadGameTypes(@Nullable CompoundTag nbt) { @@ -93,7 +93,7 @@ index a67b5fc55e769d46c8f6f395725d3d8198dcb5c6..4c0eef82969f4666ad7e30db5e174fde } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 5ef649dec31ba6d6b74a7bd757727ffd2a79d71e..1c83fbc96a074c85a3e349e936ff1f3198596709 100644 +index da2ae74b6f5875200e22c42ed07431016a90845e..35d05cc4bddea5b168a6498add1de9bcbdbfc1cb 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -74,18 +74,24 @@ public class ServerPlayerGameMode { diff --git a/patches/server/0680-ItemStack-repair-check-API.patch b/patches/server/0679-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0680-ItemStack-repair-check-API.patch rename to patches/server/0679-ItemStack-repair-check-API.patch diff --git a/patches/server/0681-More-Enchantment-API.patch b/patches/server/0680-More-Enchantment-API.patch similarity index 100% rename from patches/server/0681-More-Enchantment-API.patch rename to patches/server/0680-More-Enchantment-API.patch diff --git a/patches/server/0682-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0681-Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 100% rename from patches/server/0682-Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/server/0681-Add-command-line-option-to-load-extra-plugin-jars-no.patch diff --git a/patches/server/0683-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0682-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/0683-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0682-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/0684-Add-Mob-lookAt-API.patch b/patches/server/0683-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0684-Add-Mob-lookAt-API.patch rename to patches/server/0683-Add-Mob-lookAt-API.patch diff --git a/patches/server/0685-Add-Unix-domain-socket-support.patch b/patches/server/0684-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0685-Add-Unix-domain-socket-support.patch rename to patches/server/0684-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0686-Add-EntityInsideBlockEvent.patch b/patches/server/0685-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0686-Add-EntityInsideBlockEvent.patch rename to patches/server/0685-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0687-Attributes-API-for-item-defaults.patch b/patches/server/0686-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0687-Attributes-API-for-item-defaults.patch rename to patches/server/0686-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0688-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch b/patches/server/0687-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0688-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch rename to patches/server/0687-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch diff --git a/patches/server/0689-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0688-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0689-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0688-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0690-More-Lidded-Block-API.patch b/patches/server/0689-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0690-More-Lidded-Block-API.patch rename to patches/server/0689-More-Lidded-Block-API.patch diff --git a/patches/server/0691-Limit-item-frame-cursors-on-maps.patch b/patches/server/0690-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0691-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0690-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0692-Add-PufferFishStateChangeEvent.patch b/patches/server/0691-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0692-Add-PufferFishStateChangeEvent.patch rename to patches/server/0691-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0693-Add-PlayerKickEvent-causes.patch b/patches/server/0692-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/server/0693-Add-PlayerKickEvent-causes.patch rename to patches/server/0692-Add-PlayerKickEvent-causes.patch diff --git a/patches/server/0694-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0693-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0694-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0693-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0695-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0694-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch similarity index 100% rename from patches/server/0695-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch rename to patches/server/0694-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch diff --git a/patches/server/0696-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0695-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0696-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0695-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0697-Add-BellRevealRaiderEvent.patch b/patches/server/0696-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0697-Add-BellRevealRaiderEvent.patch rename to patches/server/0696-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0698-Fix-invulnerable-end-crystals.patch b/patches/server/0697-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0698-Fix-invulnerable-end-crystals.patch rename to patches/server/0697-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0699-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0698-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0699-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0698-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0700-Fix-dangerous-end-portal-logic.patch b/patches/server/0699-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0700-Fix-dangerous-end-portal-logic.patch rename to patches/server/0699-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0701-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0700-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0701-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0700-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0702-Make-item-validations-configurable.patch b/patches/server/0701-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0702-Make-item-validations-configurable.patch rename to patches/server/0701-Make-item-validations-configurable.patch diff --git a/patches/server/0703-Line-Of-Sight-Changes.patch b/patches/server/0702-Line-Of-Sight-Changes.patch similarity index 100% rename from patches/server/0703-Line-Of-Sight-Changes.patch rename to patches/server/0702-Line-Of-Sight-Changes.patch diff --git a/patches/server/0704-add-per-world-spawn-limits.patch b/patches/server/0703-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0704-add-per-world-spawn-limits.patch rename to patches/server/0703-add-per-world-spawn-limits.patch diff --git a/patches/server/0705-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0704-Fix-PotionSplashEvent-for-water-splash-potions.patch similarity index 100% rename from patches/server/0705-Fix-PotionSplashEvent-for-water-splash-potions.patch rename to patches/server/0704-Fix-PotionSplashEvent-for-water-splash-potions.patch diff --git a/patches/server/0706-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch b/patches/server/0705-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch similarity index 100% rename from patches/server/0706-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch rename to patches/server/0705-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch diff --git a/patches/server/0707-Add-more-LimitedRegion-API.patch b/patches/server/0706-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0707-Add-more-LimitedRegion-API.patch rename to patches/server/0706-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0708-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0707-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 91% rename from patches/server/0708-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0707-Fix-PlayerDropItemEvent-using-wrong-item.patch index 7c1f3c661..c40735d68 100644 --- a/patches/server/0708-Fix-PlayerDropItemEvent-using-wrong-item.patch +++ b/patches/server/0707-Fix-PlayerDropItemEvent-using-wrong-item.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix PlayerDropItemEvent using wrong item diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 4c0eef82969f4666ad7e30db5e174fdeb396e644..b391cc306c719aee2cd334df8d92c3ed3d282c4d 100644 +index 742ebd3c3abec18a274ab85d1a9e8ad5fa442ccb..a8c25bdaa230db9298ec2cb2fb7e09924b84be4d 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2163,7 +2163,7 @@ public class ServerPlayer extends Player { +@@ -2162,7 +2162,7 @@ public class ServerPlayer extends Player { if (retainOwnership) { if (!itemstack1.isEmpty()) { diff --git a/patches/server/0709-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0708-Deobfuscate-stacktraces-in-log-messages-crash-report.patch similarity index 100% rename from patches/server/0709-Deobfuscate-stacktraces-in-log-messages-crash-report.patch rename to patches/server/0708-Deobfuscate-stacktraces-in-log-messages-crash-report.patch diff --git a/patches/server/0710-Missing-Entity-Behavior-API.patch b/patches/server/0709-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/server/0710-Missing-Entity-Behavior-API.patch rename to patches/server/0709-Missing-Entity-Behavior-API.patch diff --git a/patches/server/0711-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0710-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/0711-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0710-Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/0712-Add-git-branch-and-commit-to-manifest.patch b/patches/server/0711-Add-git-branch-and-commit-to-manifest.patch similarity index 100% rename from patches/server/0712-Add-git-branch-and-commit-to-manifest.patch rename to patches/server/0711-Add-git-branch-and-commit-to-manifest.patch diff --git a/patches/server/0713-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0712-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0713-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0712-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0714-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0713-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0714-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0713-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0715-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0714-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0715-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0714-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0716-Adds-PlayerArmSwingEvent.patch b/patches/server/0715-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0716-Adds-PlayerArmSwingEvent.patch rename to patches/server/0715-Adds-PlayerArmSwingEvent.patch diff --git a/patches/server/0717-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0716-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 100% rename from patches/server/0717-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0716-Fixes-kick-event-leave-message-not-being-sent.patch diff --git a/patches/server/0718-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0717-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0718-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0717-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0719-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0718-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0719-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0718-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0720-Fix-MerchantOffer-BuyB-Only-AssertionError.patch b/patches/server/0719-Fix-MerchantOffer-BuyB-Only-AssertionError.patch similarity index 100% rename from patches/server/0720-Fix-MerchantOffer-BuyB-Only-AssertionError.patch rename to patches/server/0719-Fix-MerchantOffer-BuyB-Only-AssertionError.patch diff --git a/patches/server/0721-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0720-Don-t-apply-cramming-damage-to-players.patch similarity index 93% rename from patches/server/0721-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0720-Don-t-apply-cramming-damage-to-players.patch index b4fa7638b..53d3d2452 100644 --- a/patches/server/0721-Don-t-apply-cramming-damage-to-players.patch +++ b/patches/server/0720-Don-t-apply-cramming-damage-to-players.patch @@ -26,10 +26,10 @@ index 2bfadd245b5d08c1b77805ee049456cc786c093e..88abb1dfd994e5bc51aa181121407f3d } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index b391cc306c719aee2cd334df8d92c3ed3d282c4d..b242109d2d5248a4342635978def79d32d99928b 100644 +index a8c25bdaa230db9298ec2cb2fb7e09924b84be4d..0061f57c6dbd6df5bc62e4982203415db69de5aa 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1421,7 +1421,7 @@ public class ServerPlayer extends Player { +@@ -1420,7 +1420,7 @@ public class ServerPlayer extends Player { @Override public boolean isInvulnerableTo(DamageSource damageSource) { diff --git a/patches/server/0722-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0721-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0722-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0721-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0723-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0722-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0723-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0722-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0724-Stinger-API.patch b/patches/server/0723-Stinger-API.patch similarity index 100% rename from patches/server/0724-Stinger-API.patch rename to patches/server/0723-Stinger-API.patch diff --git a/patches/server/0725-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0724-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0725-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0724-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0726-Add-System.out-err-catcher.patch b/patches/server/0725-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0726-Add-System.out-err-catcher.patch rename to patches/server/0725-Add-System.out-err-catcher.patch diff --git a/patches/server/0727-Fix-test-not-bootstrapping.patch b/patches/server/0726-Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/0727-Fix-test-not-bootstrapping.patch rename to patches/server/0726-Fix-test-not-bootstrapping.patch diff --git a/patches/server/0728-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0727-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0728-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0727-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0729-Improve-boat-collision-performance.patch b/patches/server/0728-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0729-Improve-boat-collision-performance.patch rename to patches/server/0728-Improve-boat-collision-performance.patch diff --git a/patches/server/0730-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0729-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/server/0730-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0729-Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/server/0731-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0730-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0731-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0730-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0732-Add-PlayerSetSpawnEvent.patch b/patches/server/0731-Add-PlayerSetSpawnEvent.patch similarity index 97% rename from patches/server/0732-Add-PlayerSetSpawnEvent.patch rename to patches/server/0731-Add-PlayerSetSpawnEvent.patch index 37e6c9550..db7f2cbfd 100644 --- a/patches/server/0732-Add-PlayerSetSpawnEvent.patch +++ b/patches/server/0731-Add-PlayerSetSpawnEvent.patch @@ -18,10 +18,10 @@ index e95f2222814e104bf9194a96385737dffe2cb2b5..249ab7357aa19d87179fa4c3ae89d9d3 String string = resourceKey.location().toString(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index b242109d2d5248a4342635978def79d32d99928b..3e0c5379e40607554324e8fdc72a0f2a71ec7aaa 100644 +index 0061f57c6dbd6df5bc62e4982203415db69de5aa..6e44ab13755bec97b6e29335cc1e2a9d0ee685aa 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1262,7 +1262,7 @@ public class ServerPlayer extends Player { +@@ -1261,7 +1261,7 @@ public class ServerPlayer extends Player { } else if (this.bedBlocked(blockposition, enumdirection)) { return Either.left(Player.BedSleepingProblem.OBSTRUCTED); } else { @@ -30,7 +30,7 @@ index b242109d2d5248a4342635978def79d32d99928b..3e0c5379e40607554324e8fdc72a0f2a if (this.level.isDay()) { return Either.left(Player.BedSleepingProblem.NOT_POSSIBLE_NOW); } else { -@@ -2090,12 +2090,33 @@ public class ServerPlayer extends Player { +@@ -2089,12 +2089,33 @@ public class ServerPlayer extends Player { return this.respawnForced; } diff --git a/patches/server/0733-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0732-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0733-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0732-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0734-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0733-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0734-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0733-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0735-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0734-Config-option-for-Piglins-guarding-chests.patch similarity index 95% rename from patches/server/0735-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0734-Config-option-for-Piglins-guarding-chests.patch index d7359f965..6678ecd15 100644 --- a/patches/server/0735-Config-option-for-Piglins-guarding-chests.patch +++ b/patches/server/0734-Config-option-for-Piglins-guarding-chests.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config option for Piglins guarding chests diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 7a7b5d68d4a269304f4a9cb20c071b47f19af608..402b25979a217dc4662c074ee084022f57986f49 100644 +index 055f0de420fd3603b4e2580b29746c127bb1a104..a14602b6ef00e9ac544582c0d8f4f43a5fcbf908 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -54,6 +54,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0736-Added-EntityDamageItemEvent.patch b/patches/server/0735-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0736-Added-EntityDamageItemEvent.patch rename to patches/server/0735-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0737-Optimize-indirect-passenger-iteration.patch b/patches/server/0736-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0737-Optimize-indirect-passenger-iteration.patch rename to patches/server/0736-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0738-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0737-Fix-block-drops-position-losing-precision-millions-o.patch similarity index 100% rename from patches/server/0738-Fix-block-drops-position-losing-precision-millions-o.patch rename to patches/server/0737-Fix-block-drops-position-losing-precision-millions-o.patch diff --git a/patches/server/0739-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0738-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0739-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0738-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0740-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0739-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0740-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0739-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0741-Clear-bucket-NBT-after-dispense.patch b/patches/server/0740-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0741-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0740-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0742-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch b/patches/server/0741-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch similarity index 100% rename from patches/server/0742-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch rename to patches/server/0741-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch diff --git a/patches/server/0743-Respect-despawn-rate-in-item-merge-check.patch b/patches/server/0742-Respect-despawn-rate-in-item-merge-check.patch similarity index 100% rename from patches/server/0743-Respect-despawn-rate-in-item-merge-check.patch rename to patches/server/0742-Respect-despawn-rate-in-item-merge-check.patch diff --git a/patches/server/0744-Move-BlockPistonRetractEvent-to-fix-duplication.patch b/patches/server/0743-Move-BlockPistonRetractEvent-to-fix-duplication.patch similarity index 100% rename from patches/server/0744-Move-BlockPistonRetractEvent-to-fix-duplication.patch rename to patches/server/0743-Move-BlockPistonRetractEvent-to-fix-duplication.patch diff --git a/patches/server/0745-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0744-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0745-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0744-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0746-Add-BlockBreakBlockEvent.patch b/patches/server/0745-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0746-Add-BlockBreakBlockEvent.patch rename to patches/server/0745-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0747-Vanilla-command-permission-fixes.patch b/patches/server/0746-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0747-Vanilla-command-permission-fixes.patch rename to patches/server/0746-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0748-Make-CallbackExecutor-strict-again.patch b/patches/server/0747-Make-CallbackExecutor-strict-again.patch similarity index 95% rename from patches/server/0748-Make-CallbackExecutor-strict-again.patch rename to patches/server/0747-Make-CallbackExecutor-strict-again.patch index 148f7df5d..17db32765 100644 --- a/patches/server/0748-Make-CallbackExecutor-strict-again.patch +++ b/patches/server/0747-Make-CallbackExecutor-strict-again.patch @@ -10,7 +10,7 @@ schedules. Effectively, use the callback executor as a tool of finding issues rather than hiding these issues. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 91364805047c055a8755b7a2900988c750589ff7..527704fccfd905414e25ed53aff2b7dceb5cf94f 100644 +index 2a85deeab49f32a897b53707d453d1a5f2972902..dd6980326a2ec41a5eb65038ee8283a7cb8195bf 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -154,17 +154,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0749-Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/server/0748-Prevent-unload-calls-removing-tickets-for-sync-loads.patch similarity index 100% rename from patches/server/0749-Prevent-unload-calls-removing-tickets-for-sync-loads.patch rename to patches/server/0748-Prevent-unload-calls-removing-tickets-for-sync-loads.patch diff --git a/patches/server/0750-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/server/0749-Do-not-allow-ticket-level-changes-while-unloading-pl.patch similarity index 97% rename from patches/server/0750-Do-not-allow-ticket-level-changes-while-unloading-pl.patch rename to patches/server/0749-Do-not-allow-ticket-level-changes-while-unloading-pl.patch index a0f0e55d2..a705a34d5 100644 --- a/patches/server/0750-Do-not-allow-ticket-level-changes-while-unloading-pl.patch +++ b/patches/server/0749-Do-not-allow-ticket-level-changes-while-unloading-pl.patch @@ -8,7 +8,7 @@ Sync loading the chunk at this stage would cause it to load older data, as well as screwing our region state. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 527704fccfd905414e25ed53aff2b7dceb5cf94f..34a609eca833450ef6fb265e84a0c8d7ba89a2e7 100644 +index dd6980326a2ec41a5eb65038ee8283a7cb8195bf..7e750f84b7f7050bd2405ab01a233aa231db62c4 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -341,6 +341,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0751-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0750-Do-not-allow-the-server-to-unload-chunks-at-request-.patch similarity index 100% rename from patches/server/0751-Do-not-allow-the-server-to-unload-chunks-at-request-.patch rename to patches/server/0750-Do-not-allow-the-server-to-unload-chunks-at-request-.patch diff --git a/patches/server/0752-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0751-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 96% rename from patches/server/0752-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0751-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch index a22cf004f..e9707b014 100644 --- a/patches/server/0752-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch +++ b/patches/server/0751-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch @@ -28,10 +28,10 @@ index f8c0574137cab33d0b5efe5d532efb132dcb914a..7000909d2910e3e0e87e05f0a8bda826 } // Spigot End diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 3e0c5379e40607554324e8fdc72a0f2a71ec7aaa..44b2429d9cc20bdebe58203f973382a4f7ea4c6c 100644 +index 6e44ab13755bec97b6e29335cc1e2a9d0ee685aa..afad4f6069fc546f98f688715d0ae914bdd3e317 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1564,6 +1564,18 @@ public class ServerPlayer extends Player { +@@ -1563,6 +1563,18 @@ public class ServerPlayer extends Player { this.connection.send(new ClientboundContainerClosePacket(this.containerMenu.containerId)); this.doCloseContainer(); } diff --git a/patches/server/0753-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/server/0752-Correctly-handle-recursion-for-chunkholder-updates.patch similarity index 100% rename from patches/server/0753-Correctly-handle-recursion-for-chunkholder-updates.patch rename to patches/server/0752-Correctly-handle-recursion-for-chunkholder-updates.patch diff --git a/patches/server/0754-Separate-lookup-locking-from-state-access-in-UserCac.patch b/patches/server/0753-Separate-lookup-locking-from-state-access-in-UserCac.patch similarity index 100% rename from patches/server/0754-Separate-lookup-locking-from-state-access-in-UserCac.patch rename to patches/server/0753-Separate-lookup-locking-from-state-access-in-UserCac.patch diff --git a/patches/server/0755-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/server/0754-Fix-chunks-refusing-to-unload-at-low-TPS.patch similarity index 93% rename from patches/server/0755-Fix-chunks-refusing-to-unload-at-low-TPS.patch rename to patches/server/0754-Fix-chunks-refusing-to-unload-at-low-TPS.patch index a072c5a75..73f9ea770 100644 --- a/patches/server/0755-Fix-chunks-refusing-to-unload-at-low-TPS.patch +++ b/patches/server/0754-Fix-chunks-refusing-to-unload-at-low-TPS.patch @@ -10,7 +10,7 @@ chunk future to complete. We can simply schedule to the immediate executor to get this effect, rather than the main mailbox. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 34a609eca833450ef6fb265e84a0c8d7ba89a2e7..a2895a48556558ee83ab0c53137da9e5c6208a83 100644 +index 7e750f84b7f7050bd2405ab01a233aa231db62c4..410d3d840e4858dd2a4f0ac9c61ff9bb98d57c1c 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1451,9 +1451,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0756-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/server/0755-Do-not-allow-ticket-level-changes-when-updating-chun.patch similarity index 100% rename from patches/server/0756-Do-not-allow-ticket-level-changes-when-updating-chun.patch rename to patches/server/0755-Do-not-allow-ticket-level-changes-when-updating-chun.patch diff --git a/patches/server/0757-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0756-Do-not-submit-profile-lookups-to-worldgen-threads.patch similarity index 100% rename from patches/server/0757-Do-not-submit-profile-lookups-to-worldgen-threads.patch rename to patches/server/0756-Do-not-submit-profile-lookups-to-worldgen-threads.patch diff --git a/patches/server/0758-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0757-Log-when-the-async-catcher-is-tripped.patch similarity index 100% rename from patches/server/0758-Log-when-the-async-catcher-is-tripped.patch rename to patches/server/0757-Log-when-the-async-catcher-is-tripped.patch diff --git a/patches/server/0759-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0758-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0759-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0758-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0760-Fix-and-optimize-legacy-world-conversion.patch b/patches/server/0759-Fix-and-optimize-legacy-world-conversion.patch similarity index 100% rename from patches/server/0760-Fix-and-optimize-legacy-world-conversion.patch rename to patches/server/0759-Fix-and-optimize-legacy-world-conversion.patch diff --git a/patches/server/0761-Optimise-general-POI-access.patch b/patches/server/0760-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0761-Optimise-general-POI-access.patch rename to patches/server/0760-Optimise-general-POI-access.patch diff --git a/patches/server/0762-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0761-Allow-controlled-flushing-for-network-manager.patch similarity index 100% rename from patches/server/0762-Allow-controlled-flushing-for-network-manager.patch rename to patches/server/0761-Allow-controlled-flushing-for-network-manager.patch diff --git a/patches/server/0763-Add-more-async-catchers.patch b/patches/server/0762-Add-more-async-catchers.patch similarity index 100% rename from patches/server/0763-Add-more-async-catchers.patch rename to patches/server/0762-Add-more-async-catchers.patch diff --git a/patches/server/0764-Rewrite-the-light-engine.patch b/patches/server/0763-Rewrite-the-light-engine.patch similarity index 99% rename from patches/server/0764-Rewrite-the-light-engine.patch rename to patches/server/0763-Rewrite-the-light-engine.patch index 401cf8bb8..98f82f6e8 100644 --- a/patches/server/0764-Rewrite-the-light-engine.patch +++ b/patches/server/0763-Rewrite-the-light-engine.patch @@ -3843,7 +3843,7 @@ index d8be2ad889f46491e50404916fb4ae0de5f42098..29ba097a7b230ef67d4d1b5f4ebe20cd } diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java -index 943508f488bffae4269b0023f1f5c33af54bbf78..5c138478fd1bdbf84626dbcca3e8c31729e41a9f 100644 +index b0a6eb7846580489e0476e69565676e77fd224cd..54822e418e319db551bfea3218d00faf0e043f43 100644 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java @@ -55,7 +55,7 @@ public class ChunkHolder { @@ -3856,7 +3856,7 @@ index 943508f488bffae4269b0023f1f5c33af54bbf78..5c138478fd1bdbf84626dbcca3e8c317 private final DebugBuffer chunkToSaveHistory; public int oldTicketLevel; diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index a2895a48556558ee83ab0c53137da9e5c6208a83..313a591dda5ef3962b4eab377abdce7c7ad08ec7 100644 +index 410d3d840e4858dd2a4f0ac9c61ff9bb98d57c1c..6cf01d98d5d7a41f743527381d496c0d01421928 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -121,7 +121,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0765-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/server/0764-Rewrite-entity-bounding-box-lookup-calls.patch similarity index 100% rename from patches/server/0765-Rewrite-entity-bounding-box-lookup-calls.patch rename to patches/server/0764-Rewrite-entity-bounding-box-lookup-calls.patch diff --git a/patches/server/0766-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0765-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch similarity index 99% rename from patches/server/0766-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch rename to patches/server/0765-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch index abb2ace68..c15f2bd1a 100644 --- a/patches/server/0766-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch +++ b/patches/server/0765-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch @@ -926,7 +926,7 @@ index 0000000000000000000000000000000000000000..d67a40e7be030142443680c89e1763fc + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 44b2429d9cc20bdebe58203f973382a4f7ea4c6c..4345c0e1cf00cb8cd0cacc93ebc0a69009be7eff 100644 +index afad4f6069fc546f98f688715d0ae914bdd3e317..f563e52c94735648670acd80169c0f7c4d6ad36a 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -419,7 +419,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0767-Optimise-chunk-tick-iteration.patch b/patches/server/0766-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/0767-Optimise-chunk-tick-iteration.patch rename to patches/server/0766-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/0768-Execute-chunk-tasks-mid-tick.patch b/patches/server/0767-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/0768-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0767-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/0769-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0768-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0769-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0768-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0770-Do-not-copy-visible-chunks.patch b/patches/server/0769-Do-not-copy-visible-chunks.patch similarity index 100% rename from patches/server/0770-Do-not-copy-visible-chunks.patch rename to patches/server/0769-Do-not-copy-visible-chunks.patch diff --git a/patches/server/0771-Replace-player-chunk-loader-system.patch b/patches/server/0770-Replace-player-chunk-loader-system.patch similarity index 99% rename from patches/server/0771-Replace-player-chunk-loader-system.patch rename to patches/server/0770-Replace-player-chunk-loader-system.patch index b9628ded8..9384ad147 100644 --- a/patches/server/0771-Replace-player-chunk-loader-system.patch +++ b/patches/server/0770-Replace-player-chunk-loader-system.patch @@ -1160,7 +1160,7 @@ index 103657ad936f1a75ffbb92ca5eafb816e977e363..23757f466da571aec35a373112dcbba0 // Paper end diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java -index 379ba589b0423284d63782d951c64770b160cf2d..86d1bb22665bf46c7744ef653eda0caefc2a4337 100644 +index ee668b989d661e1db1bdfe05b94d7cdadeae6923..a7ae331258b9d09795fcd20e6e633d4fa8bfb7fa 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -637,7 +637,7 @@ public final class MCUtil { @@ -1548,7 +1548,7 @@ index 108f2212f8bd00247bf73ff4f3ba42830abad459..0d8a47770435c27519af4ebd78835ec7 return true; } else { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 4345c0e1cf00cb8cd0cacc93ebc0a69009be7eff..483df59a805d2724551042aa4470bc439fc2e7e9 100644 +index f563e52c94735648670acd80169c0f7c4d6ad36a..6d2d2ba4a83d887f4d52188305a4a28c2ee2f014 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -261,7 +261,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0772-Replace-ticket-level-propagator.patch b/patches/server/0771-Replace-ticket-level-propagator.patch similarity index 100% rename from patches/server/0772-Replace-ticket-level-propagator.patch rename to patches/server/0771-Replace-ticket-level-propagator.patch diff --git a/patches/server/0773-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0772-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/0773-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/0772-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/0774-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0773-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0774-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0773-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0775-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0774-Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/0775-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/0774-Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/0776-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0775-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/0776-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/0775-Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/0777-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0776-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0777-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0776-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0778-Distance-manager-tick-timings.patch b/patches/server/0777-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0778-Distance-manager-tick-timings.patch rename to patches/server/0777-Distance-manager-tick-timings.patch diff --git a/patches/server/0779-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0778-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0779-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0778-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0780-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0779-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0780-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0779-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0781-Add-packet-limiter-config.patch b/patches/server/0780-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0781-Add-packet-limiter-config.patch rename to patches/server/0780-Add-packet-limiter-config.patch diff --git a/patches/server/0782-Lag-compensate-block-breaking.patch b/patches/server/0781-Lag-compensate-block-breaking.patch similarity index 98% rename from patches/server/0782-Lag-compensate-block-breaking.patch rename to patches/server/0781-Lag-compensate-block-breaking.patch index 47ce12828..b2f1cec3a 100644 --- a/patches/server/0782-Lag-compensate-block-breaking.patch +++ b/patches/server/0781-Lag-compensate-block-breaking.patch @@ -21,7 +21,7 @@ index 7f5cd91b60a4527a915772cd4c7c7024e1e8aa2c..1560ffc5d70b7185b4dd1ada7351a75c + } } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 1c83fbc96a074c85a3e349e936ff1f3198596709..8975a806979ac028b916b826e0d051af5e760550 100644 +index 35d05cc4bddea5b168a6498add1de9bcbdbfc1cb..12998d0e9ae0e148a155faa4468b0f78b8462cc9 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -56,14 +56,28 @@ public class ServerPlayerGameMode { diff --git a/patches/server/0783-Use-hash-table-for-maintaing-changed-block-set.patch b/patches/server/0782-Use-hash-table-for-maintaing-changed-block-set.patch similarity index 94% rename from patches/server/0783-Use-hash-table-for-maintaing-changed-block-set.patch rename to patches/server/0782-Use-hash-table-for-maintaing-changed-block-set.patch index bf82c170e..568e3dbe2 100644 --- a/patches/server/0783-Use-hash-table-for-maintaing-changed-block-set.patch +++ b/patches/server/0782-Use-hash-table-for-maintaing-changed-block-set.patch @@ -7,7 +7,7 @@ When a lot of block changes occur the iteration for checking can add up a bit and cause a small performance impact. diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java -index 234a1eff2d664bf611c5337ee84d091b64cd7004..54cb9f909df7d1041cec553e1f54ff8ecff48bbe 100644 +index de0c6316c9b75a2ecc7d6abf7bcca24e25de0ac0..4588ae8037407b81c99135863eb0c4e97c564c24 100644 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java @@ -41,6 +41,8 @@ import net.minecraft.world.level.lighting.LevelLightEngine; diff --git a/patches/server/0784-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0783-Consolidate-flush-calls-for-entity-tracker-packets.patch similarity index 100% rename from patches/server/0784-Consolidate-flush-calls-for-entity-tracker-packets.patch rename to patches/server/0783-Consolidate-flush-calls-for-entity-tracker-packets.patch diff --git a/patches/server/0785-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0784-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0785-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/server/0784-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0786-Time-scoreboard-search.patch b/patches/server/0785-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0786-Time-scoreboard-search.patch rename to patches/server/0785-Time-scoreboard-search.patch diff --git a/patches/server/0787-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0786-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0787-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/0786-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0788-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0787-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0788-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/server/0787-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0789-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0788-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0789-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0788-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0790-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0789-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0790-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0789-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0791-Allow-removal-addition-of-entities-to-entity-ticklis.patch b/patches/server/0790-Allow-removal-addition-of-entities-to-entity-ticklis.patch similarity index 100% rename from patches/server/0791-Allow-removal-addition-of-entities-to-entity-ticklis.patch rename to patches/server/0790-Allow-removal-addition-of-entities-to-entity-ticklis.patch diff --git a/patches/server/0792-Optimise-random-block-ticking.patch b/patches/server/0791-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/0792-Optimise-random-block-ticking.patch rename to patches/server/0791-Optimise-random-block-ticking.patch diff --git a/patches/server/0793-Optimise-non-flush-packet-sending.patch b/patches/server/0792-Optimise-non-flush-packet-sending.patch similarity index 100% rename from patches/server/0793-Optimise-non-flush-packet-sending.patch rename to patches/server/0792-Optimise-non-flush-packet-sending.patch diff --git a/patches/server/0794-Optimise-nearby-player-lookups.patch b/patches/server/0793-Optimise-nearby-player-lookups.patch similarity index 100% rename from patches/server/0794-Optimise-nearby-player-lookups.patch rename to patches/server/0793-Optimise-nearby-player-lookups.patch diff --git a/patches/server/0795-Fix-Codec-log-spam.patch b/patches/server/0794-Fix-Codec-log-spam.patch similarity index 99% rename from patches/server/0795-Fix-Codec-log-spam.patch rename to patches/server/0794-Fix-Codec-log-spam.patch index 1c4d17c3b..962b86ce2 100644 --- a/patches/server/0795-Fix-Codec-log-spam.patch +++ b/patches/server/0794-Fix-Codec-log-spam.patch @@ -14,7 +14,7 @@ This fixes two instances: be provided for two new values (WITHOUT changing behavior). diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java -index 86d1bb22665bf46c7744ef653eda0caefc2a4337..a97295b420b55834687b76cfee1dc98c6d6acfd6 100644 +index a7ae331258b9d09795fcd20e6e633d4fa8bfb7fa..f9701ef4162868894a81f0d1ac9b58d00d9a2d65 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -718,4 +718,70 @@ public final class MCUtil { diff --git a/patches/server/0796-Optimise-WorldServer-notify.patch b/patches/server/0795-Optimise-WorldServer-notify.patch similarity index 100% rename from patches/server/0796-Optimise-WorldServer-notify.patch rename to patches/server/0795-Optimise-WorldServer-notify.patch diff --git a/patches/server/0797-Remove-streams-for-villager-AI.patch b/patches/server/0796-Remove-streams-for-villager-AI.patch similarity index 100% rename from patches/server/0797-Remove-streams-for-villager-AI.patch rename to patches/server/0796-Remove-streams-for-villager-AI.patch diff --git a/patches/server/0798-Rewrite-dataconverter-system.patch b/patches/server/0797-Rewrite-dataconverter-system.patch similarity index 100% rename from patches/server/0798-Rewrite-dataconverter-system.patch rename to patches/server/0797-Rewrite-dataconverter-system.patch diff --git a/patches/server/0799-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0798-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/0799-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/0798-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/0800-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0799-Always-parse-protochunk-light-sources-unless-it-is-m.patch similarity index 100% rename from patches/server/0800-Always-parse-protochunk-light-sources-unless-it-is-m.patch rename to patches/server/0799-Always-parse-protochunk-light-sources-unless-it-is-m.patch diff --git a/patches/server/0801-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0800-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0801-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/server/0800-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0802-Configurable-feature-seeds.patch b/patches/server/0801-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0802-Configurable-feature-seeds.patch rename to patches/server/0801-Configurable-feature-seeds.patch diff --git a/patches/server/0803-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch b/patches/server/0802-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch similarity index 100% rename from patches/server/0803-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch rename to patches/server/0802-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch