From 3d7b0490c0e7fdfded2206f4a2949ce471316057 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Sun, 13 Jun 2021 19:43:29 -0700 Subject: [PATCH] reorder patches after merge --- ...=> 0363-Tracking-Range-Improvements.patch} | 0 ...-items-vanishing-through-end-portal.patch} | 0 ...ment-optional-per-player-mob-spawns.patch} | 7 +++---- ...et-gravity-in-void.-Fixes-MC-167279.patch} | 0 ...-getChunkAt-calls-for-loaded-chunks.patch} | 2 +- ...w-overriding-the-java-version-check.patch} | 0 ...tch => 0369-Add-ThrownEggHatchEvent.patch} | 0 ... 0370-Optimise-random-block-ticking.patch} | 0 ...p-API.patch => 0371-Entity-Jump-API.patch} | 0 ...-to-nerf-pigmen-from-nether-portals.patch} | 4 ++-- ... => 0373-Make-the-GUI-graph-fancier.patch} | 0 ...74-add-hand-to-BlockMultiPlaceEvent.patch} | 0 ...5-Prevent-teleporting-dead-entities.patch} | 0 ...ipwire-hook-placement-before-update.patch} | 0 ...o-allow-iron-golems-to-spawn-in-air.patch} | 4 ++-- ...chance-of-villager-zombie-infection.patch} | 4 ++-- ...tch => 0379-Optimise-Chunk-getFluid.patch} | 0 ...mise-TickListServer-by-rewriting-it.patch} | 2 +- ...pawn-settings-and-per-player-option.patch} | 8 ++++---- ...nections-shouldn-t-hold-up-shutdown.patch} | 0 ...ow-bees-to-load-chunks-for-beehives.patch} | 0 ...PlayerChunkMap-adds-crashing-server.patch} | 4 ++-- ...timize-Collision-to-not-load-chunks.patch} | 0 ...tch => 0386-Don-t-tick-dead-players.patch} | 4 ++-- ...-Player-s-shouldn-t-be-able-to-move.patch} | 0 ...unkMap-memory-use-for-visibleChunks.patch} | 20 +++++++++---------- ...sks-Speed-up-processing-of-chunk-lo.patch} | 8 ++++---- ...ove-existing-players-to-world-spawn.patch} | 6 +++--- ...Add-tick-times-API-and-mspt-command.patch} | 0 ...92-Expose-MinecraftServer-isRunning.patch} | 0 ...dd-Raw-Byte-ItemStack-Serialization.patch} | 0 ...4-Remove-streams-from-Mob-AI-System.patch} | 0 ... => 0395-Async-command-map-building.patch} | 0 ...h => 0396-Improved-Watchdog-Support.patch} | 4 ++-- ....patch => 0397-Optimize-Pathfinding.patch} | 0 ...8-Reduce-Either-Optional-allocation.patch} | 0 ...399-Remove-streams-from-PairedQueue.patch} | 0 ...-memory-footprint-of-NBTTagCompound.patch} | 0 ...ent-opening-inventories-when-frozen.patch} | 6 +++--- ...02-Optimise-ArraySetSorted-removeIf.patch} | 0 ...entity-collision-code-if-not-needed.patch} | 0 ...teleport-command-to-valid-locations.patch} | 0 ...Implement-Player-Client-Options-API.patch} | 4 ++-- ...Chunk-Post-Processing-deadlock-risk.patch} | 10 +++++----- ...ayer-is-attempted-to-be-removed-fro.patch} | 0 ...8-Broadcast-join-message-to-console.patch} | 0 ...-Broken-behavior-of-PlayerJoinEvent.patch} | 8 ++++---- ...oad-Chunks-for-Login-Asynchronously.patch} | 6 +++--- ...awn-point-if-spawn-in-unloaded-worl.patch} | 0 ...layerAttackEntityCooldownResetEvent.patch} | 0 ...llbacks-to-schedule-for-Callback-Ex.patch} | 4 ++-- ...-fire-BlockFade-on-worldgen-threads.patch} | 0 ...tom-creative-and-insomniac-controls.patch} | 4 ++-- ...-duplication-issues-and-teleport-is.patch} | 0 ...0417-Implement-Brigadier-Mojang-API.patch} | 0 ...patch => 0418-Villager-Restocks-API.patch} | 0 ...ickItem-Packet-and-kick-for-invalid.patch} | 0 ...n.patch => 0420-Expose-game-version.patch} | 0 ...> 0421-Optimize-Voxel-Shape-Merging.patch} | 0 ...per-thread-native-byte-buffer-cache.patch} | 0 ...atch => 0423-Implement-Mob-Goal-API.patch} | 0 61 files changed, 59 insertions(+), 60 deletions(-) rename patches/server/{0362-Tracking-Range-Improvements.patch => 0363-Tracking-Range-Improvements.patch} (100%) rename patches/server/{0363-Fix-items-vanishing-through-end-portal.patch => 0364-Fix-items-vanishing-through-end-portal.patch} (100%) rename patches/server/{0363-implement-optional-per-player-mob-spawns.patch => 0365-implement-optional-per-player-mob-spawns.patch} (99%) rename patches/server/{0364-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0366-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (100%) rename patches/server/{0365-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 0367-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (96%) rename patches/server/{0366-Allow-overriding-the-java-version-check.patch => 0368-Allow-overriding-the-java-version-check.patch} (100%) rename patches/server/{0367-Add-ThrownEggHatchEvent.patch => 0369-Add-ThrownEggHatchEvent.patch} (100%) rename patches/server/{0368-Optimise-random-block-ticking.patch => 0370-Optimise-random-block-ticking.patch} (100%) rename patches/server/{0369-Entity-Jump-API.patch => 0371-Entity-Jump-API.patch} (100%) rename patches/server/{0370-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0372-Add-option-to-nerf-pigmen-from-nether-portals.patch} (95%) rename patches/server/{0371-Make-the-GUI-graph-fancier.patch => 0373-Make-the-GUI-graph-fancier.patch} (100%) rename patches/server/{0372-add-hand-to-BlockMultiPlaceEvent.patch => 0374-add-hand-to-BlockMultiPlaceEvent.patch} (100%) rename patches/server/{0373-Prevent-teleporting-dead-entities.patch => 0375-Prevent-teleporting-dead-entities.patch} (100%) rename patches/server/{0374-Validate-tripwire-hook-placement-before-update.patch => 0376-Validate-tripwire-hook-placement-before-update.patch} (100%) rename patches/server/{0375-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0377-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (92%) rename patches/server/{0376-Configurable-chance-of-villager-zombie-infection.patch => 0378-Configurable-chance-of-villager-zombie-infection.patch} (94%) rename patches/server/{0377-Optimise-Chunk-getFluid.patch => 0379-Optimise-Chunk-getFluid.patch} (100%) rename patches/server/{0378-Optimise-TickListServer-by-rewriting-it.patch => 0380-Optimise-TickListServer-by-rewriting-it.patch} (99%) rename patches/server/{0379-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0381-Pillager-patrol-spawn-settings-and-per-player-option.patch} (95%) rename patches/server/{0380-Remote-Connections-shouldn-t-hold-up-shutdown.patch => 0382-Remote-Connections-shouldn-t-hold-up-shutdown.patch} (100%) rename patches/server/{0381-Do-not-allow-bees-to-load-chunks-for-beehives.patch => 0383-Do-not-allow-bees-to-load-chunks-for-beehives.patch} (100%) rename patches/server/{0382-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch => 0384-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} (94%) rename patches/server/{0383-Optimize-Collision-to-not-load-chunks.patch => 0385-Optimize-Collision-to-not-load-chunks.patch} (100%) rename patches/server/{0384-Don-t-tick-dead-players.patch => 0386-Don-t-tick-dead-players.patch} (85%) rename patches/server/{0385-Dead-Player-s-shouldn-t-be-able-to-move.patch => 0387-Dead-Player-s-shouldn-t-be-able-to-move.patch} (100%) rename patches/server/{0386-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch => 0388-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch} (95%) rename patches/server/{0387-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch => 0389-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch} (97%) rename patches/server/{0388-Don-t-move-existing-players-to-world-spawn.patch => 0390-Don-t-move-existing-players-to-world-spawn.patch} (92%) rename patches/server/{0389-Add-tick-times-API-and-mspt-command.patch => 0391-Add-tick-times-API-and-mspt-command.patch} (100%) rename patches/server/{0390-Expose-MinecraftServer-isRunning.patch => 0392-Expose-MinecraftServer-isRunning.patch} (100%) rename patches/server/{0391-Add-Raw-Byte-ItemStack-Serialization.patch => 0393-Add-Raw-Byte-ItemStack-Serialization.patch} (100%) rename patches/server/{0392-Remove-streams-from-Mob-AI-System.patch => 0394-Remove-streams-from-Mob-AI-System.patch} (100%) rename patches/server/{0393-Async-command-map-building.patch => 0395-Async-command-map-building.patch} (100%) rename patches/server/{0394-Improved-Watchdog-Support.patch => 0396-Improved-Watchdog-Support.patch} (99%) rename patches/server/{0395-Optimize-Pathfinding.patch => 0397-Optimize-Pathfinding.patch} (100%) rename patches/server/{0396-Reduce-Either-Optional-allocation.patch => 0398-Reduce-Either-Optional-allocation.patch} (100%) rename patches/server/{0397-Remove-streams-from-PairedQueue.patch => 0399-Remove-streams-from-PairedQueue.patch} (100%) rename patches/server/{0398-Reduce-memory-footprint-of-NBTTagCompound.patch => 0400-Reduce-memory-footprint-of-NBTTagCompound.patch} (100%) rename patches/server/{0399-Prevent-opening-inventories-when-frozen.patch => 0401-Prevent-opening-inventories-when-frozen.patch} (94%) rename patches/server/{0400-Optimise-ArraySetSorted-removeIf.patch => 0402-Optimise-ArraySetSorted-removeIf.patch} (100%) rename patches/server/{0401-Don-t-run-entity-collision-code-if-not-needed.patch => 0403-Don-t-run-entity-collision-code-if-not-needed.patch} (100%) rename patches/server/{0402-Restrict-vanilla-teleport-command-to-valid-locations.patch => 0404-Restrict-vanilla-teleport-command-to-valid-locations.patch} (100%) rename patches/server/{0403-Implement-Player-Client-Options-API.patch => 0405-Implement-Player-Client-Options-API.patch} (97%) rename patches/server/{0404-Fix-Chunk-Post-Processing-deadlock-risk.patch => 0406-Fix-Chunk-Post-Processing-deadlock-risk.patch} (88%) rename patches/server/{0405-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch => 0407-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch} (100%) rename patches/server/{0406-Broadcast-join-message-to-console.patch => 0408-Broadcast-join-message-to-console.patch} (100%) rename patches/server/{0407-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch => 0409-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch} (95%) rename patches/server/{0408-Load-Chunks-for-Login-Asynchronously.patch => 0410-Load-Chunks-for-Login-Asynchronously.patch} (98%) rename patches/server/{0409-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0411-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (100%) rename patches/server/{0410-Add-PlayerAttackEntityCooldownResetEvent.patch => 0412-Add-PlayerAttackEntityCooldownResetEvent.patch} (100%) rename patches/server/{0411-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch => 0413-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch} (92%) rename patches/server/{0412-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0414-Don-t-fire-BlockFade-on-worldgen-threads.patch} (100%) rename patches/server/{0413-Add-phantom-creative-and-insomniac-controls.patch => 0415-Add-phantom-creative-and-insomniac-controls.patch} (96%) rename patches/server/{0414-Fix-numerous-item-duplication-issues-and-teleport-is.patch => 0416-Fix-numerous-item-duplication-issues-and-teleport-is.patch} (100%) rename patches/server/{0415-Implement-Brigadier-Mojang-API.patch => 0417-Implement-Brigadier-Mojang-API.patch} (100%) rename patches/server/{0416-Villager-Restocks-API.patch => 0418-Villager-Restocks-API.patch} (100%) rename patches/server/{0417-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0419-Validate-PickItem-Packet-and-kick-for-invalid.patch} (100%) rename patches/server/{0418-Expose-game-version.patch => 0420-Expose-game-version.patch} (100%) rename patches/server/{0419-Optimize-Voxel-Shape-Merging.patch => 0421-Optimize-Voxel-Shape-Merging.patch} (100%) rename patches/server/{0420-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0422-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (100%) rename patches/server/{0421-Implement-Mob-Goal-API.patch => 0423-Implement-Mob-Goal-API.patch} (100%) diff --git a/patches/server/0362-Tracking-Range-Improvements.patch b/patches/server/0363-Tracking-Range-Improvements.patch similarity index 100% rename from patches/server/0362-Tracking-Range-Improvements.patch rename to patches/server/0363-Tracking-Range-Improvements.patch diff --git a/patches/server/0363-Fix-items-vanishing-through-end-portal.patch b/patches/server/0364-Fix-items-vanishing-through-end-portal.patch similarity index 100% rename from patches/server/0363-Fix-items-vanishing-through-end-portal.patch rename to patches/server/0364-Fix-items-vanishing-through-end-portal.patch diff --git a/patches/server/0363-implement-optional-per-player-mob-spawns.patch b/patches/server/0365-implement-optional-per-player-mob-spawns.patch similarity index 99% rename from patches/server/0363-implement-optional-per-player-mob-spawns.patch rename to patches/server/0365-implement-optional-per-player-mob-spawns.patch index c62f193d0..8d1082349 100644 --- a/patches/server/0363-implement-optional-per-player-mob-spawns.patch +++ b/patches/server/0365-implement-optional-per-player-mob-spawns.patch @@ -38,7 +38,7 @@ index be4a36df28d4f16727daad1270d5c3a84ae94613..16f013ffe992a934e9d0b32e764a14a8 + perPlayerMobSpawns = getBoolean("per-player-mob-spawns", false); + } } - + diff --git a/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java b/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java new file mode 100644 index 0000000000000000000000000000000000000000..2a87599922d7075a9f888f48a2deb35ed3eb7c54 @@ -297,10 +297,9 @@ index 0000000000000000000000000000000000000000..2a87599922d7075a9f888f48a2deb35e + } + } +} - diff --git a/src/main/java/com/destroystokyo/paper/util/PooledHashSets.java b/src/main/java/com/destroystokyo/paper/util/PooledHashSets.java new file mode 100644 -index 0000000000000000000000000000000000000000..4f13d3ff8391793a99f067189f854078334499c6 +index 0000000000000000000000000000000000000000..11de56afaf059b00fa5bec293516bcdce7c4b2b9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/PooledHashSets.java @@ -0,0 +1,241 @@ @@ -546,7 +545,7 @@ index 0000000000000000000000000000000000000000..4f13d3ff8391793a99f067189f854078 + } +} diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index fdf5d8ede4b01e399272ddebfbd49258b166f00b..bd4133466eb8ad2f5f69fdf5b04bc45734cec9a4 100644 +index 273cd2e0fc38801a5ecb26579e4d0e9ee017bb3c..e1498a5a8e664b922c77a8524ed2ea38c91834ce 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -69,6 +69,7 @@ import net.minecraft.util.thread.ProcessorMailbox; diff --git a/patches/server/0364-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0366-Bees-get-gravity-in-void.-Fixes-MC-167279.patch similarity index 100% rename from patches/server/0364-Bees-get-gravity-in-void.-Fixes-MC-167279.patch rename to patches/server/0366-Bees-get-gravity-in-void.-Fixes-MC-167279.patch diff --git a/patches/server/0365-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0367-Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 96% rename from patches/server/0365-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/server/0367-Optimise-getChunkAt-calls-for-loaded-chunks.patch index 5eea71802..8a08a8419 100644 --- a/patches/server/0365-Optimise-getChunkAt-calls-for-loaded-chunks.patch +++ b/patches/server/0367-Optimise-getChunkAt-calls-for-loaded-chunks.patch @@ -7,7 +7,7 @@ bypass the need to get a player chunk, then get the either, then unwrap it... diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index c47d1772044913475a60292162ef4be594bed4c6..7cbd3db81c73d466a6e6012c1c91698b53a0cb86 100644 +index 78143fe566fef13604c46029d4184ba39ed4aefc..56aa640eb0096e5c5f1a34d6f11a4dd9ac8770df 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -451,6 +451,12 @@ public class ServerChunkCache extends ChunkSource { diff --git a/patches/server/0366-Allow-overriding-the-java-version-check.patch b/patches/server/0368-Allow-overriding-the-java-version-check.patch similarity index 100% rename from patches/server/0366-Allow-overriding-the-java-version-check.patch rename to patches/server/0368-Allow-overriding-the-java-version-check.patch diff --git a/patches/server/0367-Add-ThrownEggHatchEvent.patch b/patches/server/0369-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/0367-Add-ThrownEggHatchEvent.patch rename to patches/server/0369-Add-ThrownEggHatchEvent.patch diff --git a/patches/server/0368-Optimise-random-block-ticking.patch b/patches/server/0370-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/0368-Optimise-random-block-ticking.patch rename to patches/server/0370-Optimise-random-block-ticking.patch diff --git a/patches/server/0369-Entity-Jump-API.patch b/patches/server/0371-Entity-Jump-API.patch similarity index 100% rename from patches/server/0369-Entity-Jump-API.patch rename to patches/server/0371-Entity-Jump-API.patch diff --git a/patches/server/0370-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0372-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 95% rename from patches/server/0370-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/server/0372-Add-option-to-nerf-pigmen-from-nether-portals.patch index ede8b0de9..bd3b08c4c 100644 --- a/patches/server/0370-Add-option-to-nerf-pigmen-from-nether-portals.patch +++ b/patches/server/0372-Add-option-to-nerf-pigmen-from-nether-portals.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add option to nerf pigmen from nether portals diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 3cd8895adecd345c3bdfb8b5e3e9fdf0ef9097db..e70e0b1115422b9b901c2879138433da2d4f94d8 100644 +index 16f013ffe992a934e9d0b32e764a14a8fd204449..6c7e90f9939d42fdf8d40dd7ec0a6a86d5437451 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -441,6 +441,11 @@ public class PaperWorldConfig { +@@ -446,6 +446,11 @@ public class PaperWorldConfig { log("Hopper Move Item Events: " + (disableHopperMoveEvents ? "disabled" : "enabled")); } diff --git a/patches/server/0371-Make-the-GUI-graph-fancier.patch b/patches/server/0373-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0371-Make-the-GUI-graph-fancier.patch rename to patches/server/0373-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0372-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0374-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/server/0372-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/server/0374-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/server/0373-Prevent-teleporting-dead-entities.patch b/patches/server/0375-Prevent-teleporting-dead-entities.patch similarity index 100% rename from patches/server/0373-Prevent-teleporting-dead-entities.patch rename to patches/server/0375-Prevent-teleporting-dead-entities.patch diff --git a/patches/server/0374-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0376-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/0374-Validate-tripwire-hook-placement-before-update.patch rename to patches/server/0376-Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/0375-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0377-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 92% rename from patches/server/0375-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/server/0377-Add-option-to-allow-iron-golems-to-spawn-in-air.patch index 35a64d65e..3f7ba7afc 100644 --- a/patches/server/0375-Add-option-to-allow-iron-golems-to-spawn-in-air.patch +++ b/patches/server/0377-Add-option-to-allow-iron-golems-to-spawn-in-air.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add option to allow iron golems to spawn in air diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index e70e0b1115422b9b901c2879138433da2d4f94d8..19e0532ea296d6862ab6508658726e96e05346c9 100644 +index 6c7e90f9939d42fdf8d40dd7ec0a6a86d5437451..3ac4fe247dd12e039396da5276b83709957823c7 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -380,6 +380,11 @@ public class PaperWorldConfig { +@@ -385,6 +385,11 @@ public class PaperWorldConfig { scanForLegacyEnderDragon = getBoolean("game-mechanics.scan-for-legacy-ender-dragon", true); } diff --git a/patches/server/0376-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0378-Configurable-chance-of-villager-zombie-infection.patch similarity index 94% rename from patches/server/0376-Configurable-chance-of-villager-zombie-infection.patch rename to patches/server/0378-Configurable-chance-of-villager-zombie-infection.patch index 7c01b2f51..2e4e196e3 100644 --- a/patches/server/0376-Configurable-chance-of-villager-zombie-infection.patch +++ b/patches/server/0378-Configurable-chance-of-villager-zombie-infection.patch @@ -8,10 +8,10 @@ This allows you to solve an issue in vanilla behavior where: * On normal difficulty they will have a 50% of getting infected or dying. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 19e0532ea296d6862ab6508658726e96e05346c9..b57d9c84db5685b86cb077e3b42db7a8578d6f62 100644 +index 3ac4fe247dd12e039396da5276b83709957823c7..0863bdab8322b80a3df52c238b55c14401bafe6d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -451,6 +451,11 @@ public class PaperWorldConfig { +@@ -456,6 +456,11 @@ public class PaperWorldConfig { nerfNetherPortalPigmen = getBoolean("game-mechanics.nerf-pigmen-from-nether-portals", nerfNetherPortalPigmen); } diff --git a/patches/server/0377-Optimise-Chunk-getFluid.patch b/patches/server/0379-Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/server/0377-Optimise-Chunk-getFluid.patch rename to patches/server/0379-Optimise-Chunk-getFluid.patch diff --git a/patches/server/0378-Optimise-TickListServer-by-rewriting-it.patch b/patches/server/0380-Optimise-TickListServer-by-rewriting-it.patch similarity index 99% rename from patches/server/0378-Optimise-TickListServer-by-rewriting-it.patch rename to patches/server/0380-Optimise-TickListServer-by-rewriting-it.patch index b5d38ff41..20aa3203b 100644 --- a/patches/server/0378-Optimise-TickListServer-by-rewriting-it.patch +++ b/patches/server/0380-Optimise-TickListServer-by-rewriting-it.patch @@ -924,7 +924,7 @@ index 995d7977233f0d7683c00a75c3833f9a1eba7f92..58369d70bcd8b2c25609b6f101d9cbe2 }); // Paper end diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 7cbd3db81c73d466a6e6012c1c91698b53a0cb86..382a68c76e8946840de62f05483870689de80278 100644 +index 56aa640eb0096e5c5f1a34d6f11a4dd9ac8770df..a81c773cc281ba390d3ce44c52c43710b43829a5 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -220,6 +220,12 @@ public class ServerChunkCache extends ChunkSource { diff --git a/patches/server/0379-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0381-Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 95% rename from patches/server/0379-Pillager-patrol-spawn-settings-and-per-player-option.patch rename to patches/server/0381-Pillager-patrol-spawn-settings-and-per-player-option.patch index ff68539cd..150228e97 100644 --- a/patches/server/0379-Pillager-patrol-spawn-settings-and-per-player-option.patch +++ b/patches/server/0381-Pillager-patrol-spawn-settings-and-per-player-option.patch @@ -10,10 +10,10 @@ When not per player it will use the Vanilla mechanic of one delay per world and the world age for the start day. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index b57d9c84db5685b86cb077e3b42db7a8578d6f62..9664786d471b949880030f5c6271bf9c12529326 100644 +index 0863bdab8322b80a3df52c238b55c14401bafe6d..4a2b52b5f5c0453c204765ec77e35524ee7e77c1 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -428,10 +428,21 @@ public class PaperWorldConfig { +@@ -433,10 +433,21 @@ public class PaperWorldConfig { } public boolean disablePillagerPatrols = false; @@ -36,10 +36,10 @@ index b57d9c84db5685b86cb077e3b42db7a8578d6f62..9664786d471b949880030f5c6271bf9c 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 bffc897cb88a54c36432c98264f3416051aeab17..5b5a0c0db79452ee07c40bf7693b6701dbe0b615 100644 +index 14a0190ea5e9a387582736bb130c16a3bc94151e..c3ed4358b0cb6f252f9e3f71abe4ec9624cb7694 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 { +@@ -214,6 +214,7 @@ public class ServerPlayer extends Player { public boolean wonGame; private int containerUpdateDelay; // Paper public long loginTime; // Paper diff --git a/patches/server/0380-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0382-Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 100% rename from patches/server/0380-Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to patches/server/0382-Remote-Connections-shouldn-t-hold-up-shutdown.patch diff --git a/patches/server/0381-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0383-Do-not-allow-bees-to-load-chunks-for-beehives.patch similarity index 100% rename from patches/server/0381-Do-not-allow-bees-to-load-chunks-for-beehives.patch rename to patches/server/0383-Do-not-allow-bees-to-load-chunks-for-beehives.patch diff --git a/patches/server/0382-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0384-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 94% rename from patches/server/0382-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/server/0384-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch index 60f46ed4f..9f991f3e0 100644 --- a/patches/server/0382-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch +++ b/patches/server/0384-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch @@ -7,10 +7,10 @@ Suspected case would be around the technique used in .stopRiding Stack will identify any causer of this and warn instead of crashing. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 273cd2e0fc38801a5ecb26579e4d0e9ee017bb3c..d06c6828180b7864bf4d3736a65ea0a2dc7804e2 100644 +index e1498a5a8e664b922c77a8524ed2ea38c91834ce..71d5c298e14869d9d44226aeb6ffe3f051827d1a 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java -@@ -1445,6 +1445,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1467,6 +1467,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider protected void addEntity(Entity entity) { org.spigotmc.AsyncCatcher.catchOp("entity track"); // Spigot diff --git a/patches/server/0383-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0385-Optimize-Collision-to-not-load-chunks.patch similarity index 100% rename from patches/server/0383-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/0385-Optimize-Collision-to-not-load-chunks.patch diff --git a/patches/server/0384-Don-t-tick-dead-players.patch b/patches/server/0386-Don-t-tick-dead-players.patch similarity index 85% rename from patches/server/0384-Don-t-tick-dead-players.patch rename to patches/server/0386-Don-t-tick-dead-players.patch index d831e3b2b..95d2e787e 100644 --- a/patches/server/0384-Don-t-tick-dead-players.patch +++ b/patches/server/0386-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 5b5a0c0db79452ee07c40bf7693b6701dbe0b615..2822d493500dcd01c26ff5b205da83d8d356e119 100644 +index c3ed4358b0cb6f252f9e3f71abe4ec9624cb7694..791aa76cd09b3597f6f1e0d7e302fe9a446ea8e5 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -637,7 +637,7 @@ public class ServerPlayer extends Player { +@@ -638,7 +638,7 @@ public class ServerPlayer extends Player { public void doTick() { try { diff --git a/patches/server/0385-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0387-Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 100% rename from patches/server/0385-Dead-Player-s-shouldn-t-be-able-to-move.patch rename to patches/server/0387-Dead-Player-s-shouldn-t-be-able-to-move.patch diff --git a/patches/server/0386-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/patches/server/0388-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch similarity index 95% rename from patches/server/0386-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch rename to patches/server/0388-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch index 8118c956e..66741a408 100644 --- a/patches/server/0386-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch +++ b/patches/server/0388-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch @@ -70,10 +70,10 @@ index 9c88426ab1275ee5fb6e28be8b213533dc4ab859..87c9a5c1b43f6010898d72136b5eb997 List allChunks = new ArrayList<>(visibleChunks.values()); List players = world.players; diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index d06c6828180b7864bf4d3736a65ea0a2dc7804e2..c304c57a572b7e154362b39065ab8cb30a7e112e 100644 +index 71d5c298e14869d9d44226aeb6ffe3f051827d1a..a75de538835522f92e889452fddd5a3d8fc25f07 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java -@@ -107,9 +107,36 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -108,9 +108,36 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider private static final int MIN_VIEW_DISTANCE = 3; public static final int MAX_VIEW_DISTANCE = 33; public static final int MAX_CHUNK_DISTANCE = 33 + ChunkStatus.maxDistance(); @@ -112,7 +112,7 @@ index d06c6828180b7864bf4d3736a65ea0a2dc7804e2..c304c57a572b7e154362b39065ab8cb3 private final Long2ObjectLinkedOpenHashMap pendingUnloads; public final LongSet entitiesInLevel; // Paper - private -> public public final ServerLevel level; -@@ -231,7 +258,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -233,7 +260,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider public ChunkMap(ServerLevel world, LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, StructureManager structureManager, Executor executor, BlockableEventLoop mainThreadExecutor, LightChunkGetter chunkProvider, ChunkGenerator chunkGenerator, ChunkProgressListener worldGenerationProgressListener, ChunkStatusUpdateListener chunkStatusChangeListener, Supplier persistentStateManagerFactory, int viewDistance, boolean dsync) { super(new File(session.getDimensionPath(world.dimension()), "region"), dataFixer, dsync); @@ -121,7 +121,7 @@ index d06c6828180b7864bf4d3736a65ea0a2dc7804e2..c304c57a572b7e154362b39065ab8cb3 this.pendingUnloads = new Long2ObjectLinkedOpenHashMap(); this.entitiesInLevel = new LongOpenHashSet(); this.toDrop = new LongOpenHashSet(); -@@ -350,9 +377,52 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -372,9 +399,52 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider return (ChunkHolder) this.updatingChunkMap.get(pos); } @@ -175,7 +175,7 @@ index d06c6828180b7864bf4d3736a65ea0a2dc7804e2..c304c57a572b7e154362b39065ab8cb3 } protected IntSupplier getChunkQueueLevel(long pos) { -@@ -509,8 +579,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -531,8 +601,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider } protected void saveAllChunks(boolean flush) { @@ -186,7 +186,7 @@ index d06c6828180b7864bf4d3736a65ea0a2dc7804e2..c304c57a572b7e154362b39065ab8cb3 MutableBoolean mutableboolean = new MutableBoolean(); do { -@@ -541,7 +612,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -563,7 +634,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider // this.i(); // Paper - nuke IOWorker ChunkMap.LOGGER.info("ThreadedAnvilChunkStorage ({}): All chunks are saved", this.storageFolder.getName()); } else { @@ -195,7 +195,7 @@ index d06c6828180b7864bf4d3736a65ea0a2dc7804e2..c304c57a572b7e154362b39065ab8cb3 ChunkAccess ichunkaccess = (ChunkAccess) playerchunk.getChunkToSave().getNow(null); // CraftBukkit - decompile error if (ichunkaccess instanceof ImposterProtoChunk || ichunkaccess instanceof LevelChunk) { -@@ -701,7 +772,20 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -723,7 +794,20 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider if (!this.modified) { return false; } else { @@ -217,7 +217,7 @@ index d06c6828180b7864bf4d3736a65ea0a2dc7804e2..c304c57a572b7e154362b39065ab8cb3 this.modified = false; return true; } -@@ -1110,12 +1194,12 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1132,12 +1216,12 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider } protected Iterable getChunks() { @@ -233,10 +233,10 @@ index d06c6828180b7864bf4d3736a65ea0a2dc7804e2..c304c57a572b7e154362b39065ab8cb3 while (objectbidirectionaliterator.hasNext()) { Entry entry = (Entry) objectbidirectionaliterator.next(); diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 382a68c76e8946840de62f05483870689de80278..8523fbd66ed42cd5b959d57cab515fa4a774a575 100644 +index a81c773cc281ba390d3ce44c52c43710b43829a5..34183527a23650706a9249ffac0182cb77b18086 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -@@ -751,7 +751,7 @@ public class ServerChunkCache extends ChunkSource { +@@ -766,7 +766,7 @@ public class ServerChunkCache extends ChunkSource { }; // Paper end this.level.timings.chunkTicks.startTiming(); // Paper diff --git a/patches/server/0387-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch b/patches/server/0389-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch similarity index 97% rename from patches/server/0387-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch rename to patches/server/0389-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch index 395f0c27c..6f6470fd0 100644 --- a/patches/server/0387-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch +++ b/patches/server/0389-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch @@ -147,7 +147,7 @@ index 494a3afaaa0e3496d30e8d97edbab62b21610dfe..fa3a9d763f7072c68b126ce95fee191a // Spigot Start CrashReport crashreport; diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 8523fbd66ed42cd5b959d57cab515fa4a774a575..751454ad5a2c374c01ff360535428db36c0aa1b3 100644 +index 34183527a23650706a9249ffac0182cb77b18086..90decfade57b2f17cdcc9188962c2d2140a16b1e 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -703,6 +703,7 @@ public class ServerChunkCache extends ChunkSource { @@ -166,7 +166,7 @@ index 8523fbd66ed42cd5b959d57cab515fa4a774a575..751454ad5a2c374c01ff360535428db3 this.level.timings.doChunkUnload.stopTiming(); // Spigot this.level.getProfiler().pop(); this.clearCache(); -@@ -751,7 +753,7 @@ public class ServerChunkCache extends ChunkSource { +@@ -766,7 +768,7 @@ public class ServerChunkCache extends ChunkSource { }; // Paper end this.level.timings.chunkTicks.startTiming(); // Paper @@ -175,7 +175,7 @@ index 8523fbd66ed42cd5b959d57cab515fa4a774a575..751454ad5a2c374c01ff360535428db3 Optional optional = ((Either) playerchunk.getTickingChunkFuture().getNow(ChunkHolder.UNLOADED_LEVEL_CHUNK)).left(); if (optional.isPresent()) { -@@ -768,6 +770,7 @@ public class ServerChunkCache extends ChunkSource { +@@ -783,6 +785,7 @@ public class ServerChunkCache extends ChunkSource { chunk.setInhabitedTime(chunk.getInhabitedTime() + j); if (flag1 && (this.spawnEnemies || this.spawnFriendlies) && this.level.getWorldBorder().isWithinBounds(chunk.getPos()) && !this.chunkMap.isOutsideOfRange(chunkcoordintpair, true)) { // Spigot NaturalSpawner.spawnForChunk(this.level, chunk, spawnercreature_d, this.spawnFriendlies, this.spawnEnemies, flag2); @@ -183,7 +183,7 @@ index 8523fbd66ed42cd5b959d57cab515fa4a774a575..751454ad5a2c374c01ff360535428db3 } // this.level.timings.doTickTiles.startTiming(); // Spigot // Paper -@@ -935,6 +938,41 @@ public class ServerChunkCache extends ChunkSource { +@@ -950,6 +953,41 @@ public class ServerChunkCache extends ChunkSource { super.doRunTask(task); } diff --git a/patches/server/0388-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0390-Don-t-move-existing-players-to-world-spawn.patch similarity index 92% rename from patches/server/0388-Don-t-move-existing-players-to-world-spawn.patch rename to patches/server/0390-Don-t-move-existing-players-to-world-spawn.patch index 6b5d0a25e..2ca582d97 100644 --- a/patches/server/0388-Don-t-move-existing-players-to-world-spawn.patch +++ b/patches/server/0390-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 2822d493500dcd01c26ff5b205da83d8d356e119..bfa91166c18110877f751a5325e59623a05325d0 100644 +index 791aa76cd09b3597f6f1e0d7e302fe9a446ea8e5..a2103ba85e012bbeaf5ecf91db8d5203f576e285 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -309,7 +309,7 @@ public class ServerPlayer extends Player { @@ -22,7 +22,7 @@ index 2822d493500dcd01c26ff5b205da83d8d356e119..bfa91166c18110877f751a5325e59623 this.cachedSingleHashSet = new com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper -@@ -359,7 +359,7 @@ public class ServerPlayer extends Player { +@@ -360,7 +360,7 @@ public class ServerPlayer extends Player { } // CraftBukkit end @@ -31,7 +31,7 @@ index 2822d493500dcd01c26ff5b205da83d8d356e119..bfa91166c18110877f751a5325e59623 BlockPos blockposition = world.getSharedSpawnPos(); if (world.dimensionType().hasSkyLight() && world.serverLevelData.getGameType() != GameType.ADVENTURE) { // CraftBukkit -@@ -527,7 +527,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/0389-Add-tick-times-API-and-mspt-command.patch b/patches/server/0391-Add-tick-times-API-and-mspt-command.patch similarity index 100% rename from patches/server/0389-Add-tick-times-API-and-mspt-command.patch rename to patches/server/0391-Add-tick-times-API-and-mspt-command.patch diff --git a/patches/server/0390-Expose-MinecraftServer-isRunning.patch b/patches/server/0392-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/server/0390-Expose-MinecraftServer-isRunning.patch rename to patches/server/0392-Expose-MinecraftServer-isRunning.patch diff --git a/patches/server/0391-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0393-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/server/0391-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/server/0393-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/server/0392-Remove-streams-from-Mob-AI-System.patch b/patches/server/0394-Remove-streams-from-Mob-AI-System.patch similarity index 100% rename from patches/server/0392-Remove-streams-from-Mob-AI-System.patch rename to patches/server/0394-Remove-streams-from-Mob-AI-System.patch diff --git a/patches/server/0393-Async-command-map-building.patch b/patches/server/0395-Async-command-map-building.patch similarity index 100% rename from patches/server/0393-Async-command-map-building.patch rename to patches/server/0395-Async-command-map-building.patch diff --git a/patches/server/0394-Improved-Watchdog-Support.patch b/patches/server/0396-Improved-Watchdog-Support.patch similarity index 99% rename from patches/server/0394-Improved-Watchdog-Support.patch rename to patches/server/0396-Improved-Watchdog-Support.patch index be6786aad..52408524a 100644 --- a/patches/server/0394-Improved-Watchdog-Support.patch +++ b/patches/server/0396-Improved-Watchdog-Support.patch @@ -262,10 +262,10 @@ index 0511f1921193b78cbf4d8426136bf1f79746f955..e5f7f043cbdb28d85b8aa0eea7cbaeb5 @Override diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index c304c57a572b7e154362b39065ab8cb30a7e112e..c82345c74e0e6246f304283c2e06e2d1fcfe53ca 100644 +index a75de538835522f92e889452fddd5a3d8fc25f07..ccf50500b53f7336db1d3d287ec6f2a0da3d4183 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java -@@ -585,6 +585,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -607,6 +607,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider MutableBoolean mutableboolean = new MutableBoolean(); do { diff --git a/patches/server/0395-Optimize-Pathfinding.patch b/patches/server/0397-Optimize-Pathfinding.patch similarity index 100% rename from patches/server/0395-Optimize-Pathfinding.patch rename to patches/server/0397-Optimize-Pathfinding.patch diff --git a/patches/server/0396-Reduce-Either-Optional-allocation.patch b/patches/server/0398-Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/0396-Reduce-Either-Optional-allocation.patch rename to patches/server/0398-Reduce-Either-Optional-allocation.patch diff --git a/patches/server/0397-Remove-streams-from-PairedQueue.patch b/patches/server/0399-Remove-streams-from-PairedQueue.patch similarity index 100% rename from patches/server/0397-Remove-streams-from-PairedQueue.patch rename to patches/server/0399-Remove-streams-from-PairedQueue.patch diff --git a/patches/server/0398-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0400-Reduce-memory-footprint-of-NBTTagCompound.patch similarity index 100% rename from patches/server/0398-Reduce-memory-footprint-of-NBTTagCompound.patch rename to patches/server/0400-Reduce-memory-footprint-of-NBTTagCompound.patch diff --git a/patches/server/0399-Prevent-opening-inventories-when-frozen.patch b/patches/server/0401-Prevent-opening-inventories-when-frozen.patch similarity index 94% rename from patches/server/0399-Prevent-opening-inventories-when-frozen.patch rename to patches/server/0401-Prevent-opening-inventories-when-frozen.patch index 29b12f74d..2c7b34bab 100644 --- a/patches/server/0399-Prevent-opening-inventories-when-frozen.patch +++ b/patches/server/0401-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 bfa91166c18110877f751a5325e59623a05325d0..42c2862530cff79a9b09850faccb683df1f2a5c8 100644 +index a2103ba85e012bbeaf5ecf91db8d5203f576e285..d9db660db873bade362ef40aa776293a001564a9 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -608,7 +608,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 bfa91166c18110877f751a5325e59623a05325d0..42c2862530cff79a9b09850faccb683d this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.CANT_USE); // Paper this.containerMenu = this.inventoryMenu; } -@@ -1449,7 +1449,7 @@ public class ServerPlayer extends Player { +@@ -1450,7 +1450,7 @@ public class ServerPlayer extends Player { } else { // CraftBukkit start this.containerMenu = container; diff --git a/patches/server/0400-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0402-Optimise-ArraySetSorted-removeIf.patch similarity index 100% rename from patches/server/0400-Optimise-ArraySetSorted-removeIf.patch rename to patches/server/0402-Optimise-ArraySetSorted-removeIf.patch diff --git a/patches/server/0401-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0403-Don-t-run-entity-collision-code-if-not-needed.patch similarity index 100% rename from patches/server/0401-Don-t-run-entity-collision-code-if-not-needed.patch rename to patches/server/0403-Don-t-run-entity-collision-code-if-not-needed.patch diff --git a/patches/server/0402-Restrict-vanilla-teleport-command-to-valid-locations.patch b/patches/server/0404-Restrict-vanilla-teleport-command-to-valid-locations.patch similarity index 100% rename from patches/server/0402-Restrict-vanilla-teleport-command-to-valid-locations.patch rename to patches/server/0404-Restrict-vanilla-teleport-command-to-valid-locations.patch diff --git a/patches/server/0403-Implement-Player-Client-Options-API.patch b/patches/server/0405-Implement-Player-Client-Options-API.patch similarity index 97% rename from patches/server/0403-Implement-Player-Client-Options-API.patch rename to patches/server/0405-Implement-Player-Client-Options-API.patch index 0f8578078..ef5eadd09 100644 --- a/patches/server/0403-Implement-Player-Client-Options-API.patch +++ b/patches/server/0405-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 42c2862530cff79a9b09850faccb683df1f2a5c8..aec3ded7f65e4a97796afc01b71eeb89c2b3fb70 100644 +index d9db660db873bade362ef40aa776293a001564a9..c3aae7bc629b08b8bc1b40973adebfd6aa1edbfd 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1801,6 +1801,7 @@ public class ServerPlayer extends Player { +@@ -1802,6 +1802,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/0404-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/server/0406-Fix-Chunk-Post-Processing-deadlock-risk.patch similarity index 88% rename from patches/server/0404-Fix-Chunk-Post-Processing-deadlock-risk.patch rename to patches/server/0406-Fix-Chunk-Post-Processing-deadlock-risk.patch index eff3a5534..0818f079c 100644 --- a/patches/server/0404-Fix-Chunk-Post-Processing-deadlock-risk.patch +++ b/patches/server/0406-Fix-Chunk-Post-Processing-deadlock-risk.patch @@ -25,10 +25,10 @@ This successfully fixed a reoccurring and highly reproduceable crash for heightmaps. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index c82345c74e0e6246f304283c2e06e2d1fcfe53ca..d3094c8a6a906737d4ca56a76ff40b3586961680 100644 +index ccf50500b53f7336db1d3d287ec6f2a0da3d4183..f651b7d2bbc2fc883bc73ef892de62624d1285e7 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java -@@ -189,6 +189,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -191,6 +191,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider }; // CraftBukkit end @@ -36,7 +36,7 @@ index c82345c74e0e6246f304283c2e06e2d1fcfe53ca..d3094c8a6a906737d4ca56a76ff40b35 // Paper start - distance maps private final com.destroystokyo.paper.util.misc.PooledLinkedHashSets pooledLinkedPlayerHashSets = new com.destroystokyo.paper.util.misc.PooledLinkedHashSets<>(); // Paper start - no-tick view distance -@@ -1028,7 +1029,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1050,7 +1051,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider return Either.left(chunk); }); }, (runnable) -> { @@ -46,10 +46,10 @@ index c82345c74e0e6246f304283c2e06e2d1fcfe53ca..d3094c8a6a906737d4ca56a76ff40b35 completablefuture1.thenAcceptAsync((either) -> { diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 751454ad5a2c374c01ff360535428db36c0aa1b3..e4f5f564892836a2e925f419e8fcb60c70b21a47 100644 +index 90decfade57b2f17cdcc9188962c2d2140a16b1e..60cdb1f5c3f329b417f340f1d2651d89c244e439 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -@@ -985,6 +985,7 @@ public class ServerChunkCache extends ChunkSource { +@@ -1000,6 +1000,7 @@ public class ServerChunkCache extends ChunkSource { return super.pollTask() || execChunkTask; // Paper } } finally { diff --git a/patches/server/0405-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0407-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/0405-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/server/0407-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/0406-Broadcast-join-message-to-console.patch b/patches/server/0408-Broadcast-join-message-to-console.patch similarity index 100% rename from patches/server/0406-Broadcast-join-message-to-console.patch rename to patches/server/0408-Broadcast-join-message-to-console.patch diff --git a/patches/server/0407-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0409-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch similarity index 95% rename from patches/server/0407-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to patches/server/0409-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch index c85247b41..3f471ab0a 100644 --- a/patches/server/0407-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch +++ b/patches/server/0409-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch @@ -28,10 +28,10 @@ receives a deterministic result, and should no longer require 1 tick delays anymore. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index d3094c8a6a906737d4ca56a76ff40b3586961680..2cb807f7095648948527b5b9151770193970cc00 100644 +index f651b7d2bbc2fc883bc73ef892de62624d1285e7..6c763b5407425b764839b921f4dc9e18d76442cd 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java -@@ -1529,7 +1529,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1551,7 +1551,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider // Paper end - per player view distance } @@ -40,7 +40,7 @@ index d3094c8a6a906737d4ca56a76ff40b3586961680..2cb807f7095648948527b5b915177019 org.spigotmc.AsyncCatcher.catchOp("entity track"); // Spigot // Paper start - ignore and warn about illegal addEntity calls instead of crashing server if (!entity.valid || entity.level != this.level || this.entityMap.containsKey(entity.getId())) { -@@ -1538,6 +1538,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1560,6 +1560,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider .printStackTrace(); return; } @@ -49,7 +49,7 @@ index d3094c8a6a906737d4ca56a76ff40b3586961680..2cb807f7095648948527b5b915177019 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 aec3ded7f65e4a97796afc01b71eeb89c2b3fb70..a30840b74bc2574725c42735f633630d9b471d54 100644 +index c3aae7bc629b08b8bc1b40973adebfd6aa1edbfd..48f089040dd21342d001b91135ec9128ad5e1027 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -237,6 +237,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0408-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0410-Load-Chunks-for-Login-Asynchronously.patch similarity index 98% rename from patches/server/0408-Load-Chunks-for-Login-Asynchronously.patch rename to patches/server/0410-Load-Chunks-for-Login-Asynchronously.patch index 399eeca8a..22009dda6 100644 --- a/patches/server/0408-Load-Chunks-for-Login-Asynchronously.patch +++ b/patches/server/0410-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/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index e4f5f564892836a2e925f419e8fcb60c70b21a47..afc9431b61f2953229765ef90005b7968fbed591 100644 +index 60cdb1f5c3f329b417f340f1d2651d89c244e439..3d1c4f8e0db37c6dabece657a17595e7bf1e3dc2 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -630,7 +630,7 @@ public class ServerChunkCache extends ChunkSource { @@ -18,10 +18,10 @@ index e4f5f564892836a2e925f419e8fcb60c70b21a47..afc9431b61f2953229765ef90005b796 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 a30840b74bc2574725c42735f633630d9b471d54..d4ec913a96c5f8f9780d78f6f340d844718a5849 100644 +index 48f089040dd21342d001b91135ec9128ad5e1027..c083ee1322f86809300fce1552eacd663aaa650d 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -177,6 +177,7 @@ public class ServerPlayer extends Player { +@@ -172,6 +172,7 @@ public class ServerPlayer extends Player { private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_XZ = 32; private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10; public ServerGamePacketListenerImpl connection; diff --git a/patches/server/0409-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0411-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 100% rename from patches/server/0409-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/server/0411-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch diff --git a/patches/server/0410-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0412-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/server/0410-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/server/0412-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/server/0411-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/patches/server/0413-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch similarity index 92% rename from patches/server/0411-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch rename to patches/server/0413-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch index 1ad36331e..2dc86442f 100644 --- a/patches/server/0411-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch +++ b/patches/server/0413-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch @@ -14,10 +14,10 @@ Use an ArrayDeque to store this Queue We make sure to also implement a pattern that is recursion safe too. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 2cb807f7095648948527b5b9151770193970cc00..7fa35cba408d036e649e6d63bace88e6047c02b4 100644 +index 6c763b5407425b764839b921f4dc9e18d76442cd..f81c7a6bf2ba1564874a7865cde3c4f36e28055a 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java -@@ -172,15 +172,27 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -174,15 +174,27 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider public final CallbackExecutor callbackExecutor = new CallbackExecutor(); public static final class CallbackExecutor implements java.util.concurrent.Executor, Runnable { diff --git a/patches/server/0412-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0414-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0412-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/server/0414-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0413-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0415-Add-phantom-creative-and-insomniac-controls.patch similarity index 96% rename from patches/server/0413-Add-phantom-creative-and-insomniac-controls.patch rename to patches/server/0415-Add-phantom-creative-and-insomniac-controls.patch index 6b22ec66c..ae7582ec6 100644 --- a/patches/server/0413-Add-phantom-creative-and-insomniac-controls.patch +++ b/patches/server/0415-Add-phantom-creative-and-insomniac-controls.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add phantom creative and insomniac controls diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 9664786d471b949880030f5c6271bf9c12529326..45058c715152e3ffa5ec1c79a472e32d63d69e02 100644 +index 4a2b52b5f5c0453c204765ec77e35524ee7e77c1..16cf7d116e3ffd44ffc4f060b4014b52389cff77 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -472,6 +472,13 @@ public class PaperWorldConfig { +@@ -477,6 +477,13 @@ public class PaperWorldConfig { lightQueueSize = getInt("light-queue-size", lightQueueSize); } diff --git a/patches/server/0414-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0416-Fix-numerous-item-duplication-issues-and-teleport-is.patch similarity index 100% rename from patches/server/0414-Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to patches/server/0416-Fix-numerous-item-duplication-issues-and-teleport-is.patch diff --git a/patches/server/0415-Implement-Brigadier-Mojang-API.patch b/patches/server/0417-Implement-Brigadier-Mojang-API.patch similarity index 100% rename from patches/server/0415-Implement-Brigadier-Mojang-API.patch rename to patches/server/0417-Implement-Brigadier-Mojang-API.patch diff --git a/patches/server/0416-Villager-Restocks-API.patch b/patches/server/0418-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0416-Villager-Restocks-API.patch rename to patches/server/0418-Villager-Restocks-API.patch diff --git a/patches/server/0417-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0419-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 100% rename from patches/server/0417-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/server/0419-Validate-PickItem-Packet-and-kick-for-invalid.patch diff --git a/patches/server/0418-Expose-game-version.patch b/patches/server/0420-Expose-game-version.patch similarity index 100% rename from patches/server/0418-Expose-game-version.patch rename to patches/server/0420-Expose-game-version.patch diff --git a/patches/server/0419-Optimize-Voxel-Shape-Merging.patch b/patches/server/0421-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/0419-Optimize-Voxel-Shape-Merging.patch rename to patches/server/0421-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/0420-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0422-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 100% rename from patches/server/0420-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/server/0422-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch diff --git a/patches/server/0421-Implement-Mob-Goal-API.patch b/patches/server/0423-Implement-Mob-Goal-API.patch similarity index 100% rename from patches/server/0421-Implement-Mob-Goal-API.patch rename to patches/server/0423-Implement-Mob-Goal-API.patch