From d70d3a044cd65b4becae6ef01c97b4739382a6d2 Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Tue, 16 Jul 2024 20:11:23 +0800
Subject: [PATCH] Drop Optimize random calls in chunk ticking

---
 ...0023-Optimize-random-calls-in-chunk-ticking.patch |  2 ++
 ...023-Reduce-enderman-teleport-chunk-lookups.patch} |  0
 ...0024-Reduce-acquire-POI-for-stuck-entities.patch} |  0
 ...5-Remove-iterators-from-Inventory-contains.patch} |  0
 ...-targeting-range-before-getting-visibility.patch} |  0
 ...k-trace-for-plugins-not-shutting-down-task.patch} |  0
 ...ch => 0028-Improve-fluid-direction-caching.patch} |  0
 ...eck.patch => 0029-Cache-on-climbable-check.patch} |  0
 ...tityCollisionContext-a-live-representation.patch} |  0
 ...1-Improve-container-checking-with-a-bitset.patch} |  0
 ...2-Better-checking-for-useless-move-packets.patch} |  0
 ...l-height.patch => 0033-Inline-level-height.patch} |  0
 ...ove-streams-and-iterators-from-range-check.patch} |  0
 ...ch => 0035-Block-goal-does-not-load-chunks.patch} |  0
 ...ns.patch => 0036-Reduce-entity-allocations.patch} |  0
 ...h => 0037-Remove-lambda-from-ticking-guard.patch} |  2 +-
 ...8-Reduce-entity-fluid-lookups-if-no-fluids.patch} |  0
 ...40-SIMD-support.patch => 0039-SIMD-support.patch} |  0
 ...tch => 0040-Make-book-writing-configurable.patch} |  0
 ...tch => 0041-Optimize-entity-coordinate-key.patch} |  0
 ...checks.patch => 0042-Reduce-in-wall-checks.patch} |  0
 ...-Make-chat-order-verification-configurable.patch} |  0
 ...-dragon-respawn-attempt-after-placing-end-.patch} |  0
 ...=> 0045-Make-saving-fireworks-configurable.patch} |  0
 ...ks.patch => 0046-Reduce-hopper-item-checks.patch} |  0
 ...tch => 0047-Reduce-villager-item-re-pickup.patch} |  0
 ...h => 0048-Variable-entity-wake-up-duration.patch} |  0
 ...cess-chat-commands-before-player-has-joine.patch} |  0
 ...atch => 0050-Do-not-log-invalid-statistics.patch} |  0
 ... => 0051-Do-not-log-empty-message-warnings.patch} |  0
 ...ch => 0052-Do-not-log-ignored-advancements.patch} |  0
 ... => 0053-Do-not-log-setBlock-in-far-chunks.patch} |  0
 ...ch => 0054-Do-not-log-unrecognized-recipes.patch} |  0
 ...-Do-not-log-legacy-Material-initialization.patch} |  0
 ...ch => 0056-Do-not-log-plugin-library-loads.patch} |  0
 ...> 0057-Do-not-log-expired-message-warnings.patch} |  0
 ...patch => 0058-Do-not-log-Not-Secure-marker.patch} |  0
 ...059-Do-not-log-disconnections-with-null-id.patch} |  0
 ...tch => 0060-Do-not-log-run-as-root-warning.patch} |  0
 ...ch => 0061-Do-not-log-offline-mode-warning.patch} |  0
 ...062-Softly-log-invalid-pool-element-errors.patch} |  0
 ...ed-server-showing-in-ping-before-server-fu.patch} |  0
 ...-Fix-MC-238526.patch => 0064-Fix-MC-238526.patch} |  0
 ...5-Fix-cow-rotation-when-shearing-mooshroom.patch} |  0
 ...-Fix-MC-121706.patch => 0066-Fix-MC-121706.patch} |  0
 ...-Fix-MC-110386.patch => 0067-Fix-MC-110386.patch} |  0
 ...69-Fix-MC-31819.patch => 0068-Fix-MC-31819.patch} |  0
 ...70-Fix-MC-26304.patch => 0069-Fix-MC-26304.patch} |  0
 ...-movement-resetting-despawn-counter-config.patch} |  0
 ...-Make-logging-login-locations-configurable.patch} |  0
 ...ons.patch => 0072-Reduce-array-allocations.patch} |  0
 ...-tick.patch => 0073-Optimize-sun-burn-tick.patch} |  0
 ...bda-and-Optional-allocation-in-EntityBased.patch} |  0
 ...e-game-rules-map-with-optimized-collection.patch} |  0
 ...eplace-class-map-with-optimized-collection.patch} |  0
 ...rottle-tracker-map-with-optimized-collecti.patch} |  0
 ...s-isAssignableFrom-call-in-ClassInstanceMu.patch} |  0
 ...patch => 0079-Cache-BlockStatePairKey-hash.patch} |  0
 ...vision-by-multiplication-in-CubePointRange.patch} |  0
 ...81-Replace-parts-by-size-in-CubePointRange.patch} |  0
 ...82-Check-frozen-ticks-before-landing-block.patch} |  0
 ...n.patch => 0083-Faster-chunk-serialization.patch} |  0
 ....patch => 0084-Update-boss-bar-within-tick.patch} |  0
 ...em.patch => 0085-Cache-ominous-banner-item.patch} |  0
 ...ch => 0086-Cache-world-generator-sea-level.patch} |  0
 ...> 0087-Skip-secondary-POI-sensor-if-absent.patch} |  0
 ...tch => 0088-Optimize-villager-data-storage.patch} |  0
 ... 0089-Skip-entity-move-if-movement-is-zero.patch} |  0
 ...patch => 0090-Store-mob-counts-in-an-array.patch} |  0
 ...=> 0091-Use-linked-map-for-entity-trackers.patch} |  0
 ...on.patch => 0092-Optimize-noise-generation.patch} |  0
 ...tch => 0093-Optimize-sheep-offspring-color.patch} |  0
 ...de-flames-on-entities-with-fire-resistance.patch} |  0
 ... => 0095-Skip-cloning-advancement-criteria.patch} |  0
 ...educe-block-destruction-packet-allocations.patch} |  6 +++---
 ...=> 0097-Spread-out-sending-all-player-info.patch} |  0
 ...timize-player-list-for-sending-player-info.patch} |  0
 ...rCommandSendEvent-if-there-are-no-listener.patch} |  0
 ...h => 0100-Send-multiple-keep-alive-packets.patch} |  0
 ... 0101-Make-slow-login-timeout-configurable.patch} |  0
 ...l-destination-chunk-before-entity-teleport.patch} |  0
 ...> 0103-Don-t-load-chunks-to-spawn-phantoms.patch} |  0
 ...-load-chunks-to-activate-climbing-entities.patch} |  0
 ...crit-animations-as-the-entity-being-critte.patch} |  0
 ... => 0106-Ignore-null-legacy-structure-data.patch} |  0
 ...Skip-unnecessary-mob-spawning-computations.patch} | 12 ++++++------
 ...tities-random-strolling-into-non-ticking-c.patch} |  0
 ...ce-player-in-world-if-kicked-before-being-.patch} |  0
 ...atch => 0110-CraftBukkit-UUID-to-world-map.patch} |  0
 ...l-EULA-file.patch => 0111-Global-EULA-file.patch} |  0
 ...PI.patch => 0112-Specific-interval-TPS-API.patch} |  0
 ...average.patch => 0113-5-second-TPS-average.patch} |  0
 ...-time.patch => 0114-Measure-last-tick-time.patch} |  0
 ...-time-API.patch => 0115-Last-tick-time-API.patch} |  0
 ...=> 0116-Show-last-tick-time-in-tps-command.patch} |  0
 ...0117-Increase-time-statistics-in-intervals.patch} |  0
 ...sion-check-has-physics-before-same-vehicle.patch} |  0
 ...-negligible-planar-movement-multiplication.patch} |  0
 ...atch => 0120-Optimize-matching-item-checks.patch} |  0
 ...es.patch => 0121-Pre-compute-VarLong-sizes.patch} |  0
 ...22-Optimize-VarInt-write-and-VarLong-write.patch} |  0
 ...atch => 0123-Reduce-RandomSource-instances.patch} |  0
 ...-random.patch => 0124-Add-xor-shift-random.patch} |  0
 ...ll-ItemStack-lookups-for-reduced-visibilit.patch} |  0
 ...lize-line-of-sight-cache-with-low-capacity.patch} |  0
 ...ce-line-of-sight-updates-and-cache-lookups.patch} |  0
 ...erver-thread-priority-environment-variable.patch} |  0
 ...pport.patch => 0129-Virtual-thread-support.patch} |  0
 108 files changed, 12 insertions(+), 10 deletions(-)
 rename patches/{ => removed}/server/0023-Optimize-random-calls-in-chunk-ticking.patch (99%)
 rename patches/server/{0024-Reduce-enderman-teleport-chunk-lookups.patch => 0023-Reduce-enderman-teleport-chunk-lookups.patch} (100%)
 rename patches/server/{0025-Reduce-acquire-POI-for-stuck-entities.patch => 0024-Reduce-acquire-POI-for-stuck-entities.patch} (100%)
 rename patches/server/{0026-Remove-iterators-from-Inventory-contains.patch => 0025-Remove-iterators-from-Inventory-contains.patch} (100%)
 rename patches/server/{0027-Check-targeting-range-before-getting-visibility.patch => 0026-Check-targeting-range-before-getting-visibility.patch} (100%)
 rename patches/server/{0028-Print-stack-trace-for-plugins-not-shutting-down-task.patch => 0027-Print-stack-trace-for-plugins-not-shutting-down-task.patch} (100%)
 rename patches/server/{0029-Improve-fluid-direction-caching.patch => 0028-Improve-fluid-direction-caching.patch} (100%)
 rename patches/server/{0030-Cache-on-climbable-check.patch => 0029-Cache-on-climbable-check.patch} (100%)
 rename patches/server/{0031-Make-EntityCollisionContext-a-live-representation.patch => 0030-Make-EntityCollisionContext-a-live-representation.patch} (100%)
 rename patches/server/{0032-Improve-container-checking-with-a-bitset.patch => 0031-Improve-container-checking-with-a-bitset.patch} (100%)
 rename patches/server/{0033-Better-checking-for-useless-move-packets.patch => 0032-Better-checking-for-useless-move-packets.patch} (100%)
 rename patches/server/{0034-Inline-level-height.patch => 0033-Inline-level-height.patch} (100%)
 rename patches/server/{0035-Remove-streams-and-iterators-from-range-check.patch => 0034-Remove-streams-and-iterators-from-range-check.patch} (100%)
 rename patches/server/{0036-Block-goal-does-not-load-chunks.patch => 0035-Block-goal-does-not-load-chunks.patch} (100%)
 rename patches/server/{0037-Reduce-entity-allocations.patch => 0036-Reduce-entity-allocations.patch} (100%)
 rename patches/server/{0038-Remove-lambda-from-ticking-guard.patch => 0037-Remove-lambda-from-ticking-guard.patch} (98%)
 rename patches/server/{0039-Reduce-entity-fluid-lookups-if-no-fluids.patch => 0038-Reduce-entity-fluid-lookups-if-no-fluids.patch} (100%)
 rename patches/server/{0040-SIMD-support.patch => 0039-SIMD-support.patch} (100%)
 rename patches/server/{0041-Make-book-writing-configurable.patch => 0040-Make-book-writing-configurable.patch} (100%)
 rename patches/server/{0042-Optimize-entity-coordinate-key.patch => 0041-Optimize-entity-coordinate-key.patch} (100%)
 rename patches/server/{0043-Reduce-in-wall-checks.patch => 0042-Reduce-in-wall-checks.patch} (100%)
 rename patches/server/{0044-Make-chat-order-verification-configurable.patch => 0043-Make-chat-order-verification-configurable.patch} (100%)
 rename patches/server/{0045-Make-ender-dragon-respawn-attempt-after-placing-end-.patch => 0044-Make-ender-dragon-respawn-attempt-after-placing-end-.patch} (100%)
 rename patches/server/{0046-Make-saving-fireworks-configurable.patch => 0045-Make-saving-fireworks-configurable.patch} (100%)
 rename patches/server/{0047-Reduce-hopper-item-checks.patch => 0046-Reduce-hopper-item-checks.patch} (100%)
 rename patches/server/{0048-Reduce-villager-item-re-pickup.patch => 0047-Reduce-villager-item-re-pickup.patch} (100%)
 rename patches/server/{0049-Variable-entity-wake-up-duration.patch => 0048-Variable-entity-wake-up-duration.patch} (100%)
 rename patches/server/{0050-Do-not-process-chat-commands-before-player-has-joine.patch => 0049-Do-not-process-chat-commands-before-player-has-joine.patch} (100%)
 rename patches/server/{0051-Do-not-log-invalid-statistics.patch => 0050-Do-not-log-invalid-statistics.patch} (100%)
 rename patches/server/{0052-Do-not-log-empty-message-warnings.patch => 0051-Do-not-log-empty-message-warnings.patch} (100%)
 rename patches/server/{0053-Do-not-log-ignored-advancements.patch => 0052-Do-not-log-ignored-advancements.patch} (100%)
 rename patches/server/{0054-Do-not-log-setBlock-in-far-chunks.patch => 0053-Do-not-log-setBlock-in-far-chunks.patch} (100%)
 rename patches/server/{0055-Do-not-log-unrecognized-recipes.patch => 0054-Do-not-log-unrecognized-recipes.patch} (100%)
 rename patches/server/{0056-Do-not-log-legacy-Material-initialization.patch => 0055-Do-not-log-legacy-Material-initialization.patch} (100%)
 rename patches/server/{0057-Do-not-log-plugin-library-loads.patch => 0056-Do-not-log-plugin-library-loads.patch} (100%)
 rename patches/server/{0058-Do-not-log-expired-message-warnings.patch => 0057-Do-not-log-expired-message-warnings.patch} (100%)
 rename patches/server/{0059-Do-not-log-Not-Secure-marker.patch => 0058-Do-not-log-Not-Secure-marker.patch} (100%)
 rename patches/server/{0060-Do-not-log-disconnections-with-null-id.patch => 0059-Do-not-log-disconnections-with-null-id.patch} (100%)
 rename patches/server/{0061-Do-not-log-run-as-root-warning.patch => 0060-Do-not-log-run-as-root-warning.patch} (100%)
 rename patches/server/{0062-Do-not-log-offline-mode-warning.patch => 0061-Do-not-log-offline-mode-warning.patch} (100%)
 rename patches/server/{0063-Softly-log-invalid-pool-element-errors.patch => 0062-Softly-log-invalid-pool-element-errors.patch} (100%)
 rename patches/server/{0064-Fix-outdated-server-showing-in-ping-before-server-fu.patch => 0063-Fix-outdated-server-showing-in-ping-before-server-fu.patch} (100%)
 rename patches/server/{0065-Fix-MC-238526.patch => 0064-Fix-MC-238526.patch} (100%)
 rename patches/server/{0066-Fix-cow-rotation-when-shearing-mooshroom.patch => 0065-Fix-cow-rotation-when-shearing-mooshroom.patch} (100%)
 rename patches/server/{0067-Fix-MC-121706.patch => 0066-Fix-MC-121706.patch} (100%)
 rename patches/server/{0068-Fix-MC-110386.patch => 0067-Fix-MC-110386.patch} (100%)
 rename patches/server/{0069-Fix-MC-31819.patch => 0068-Fix-MC-31819.patch} (100%)
 rename patches/server/{0070-Fix-MC-26304.patch => 0069-Fix-MC-26304.patch} (100%)
 rename patches/server/{0071-Make-arrow-movement-resetting-despawn-counter-config.patch => 0070-Make-arrow-movement-resetting-despawn-counter-config.patch} (100%)
 rename patches/server/{0072-Make-logging-login-locations-configurable.patch => 0071-Make-logging-login-locations-configurable.patch} (100%)
 rename patches/server/{0073-Reduce-array-allocations.patch => 0072-Reduce-array-allocations.patch} (100%)
 rename patches/server/{0074-Optimize-sun-burn-tick.patch => 0073-Optimize-sun-burn-tick.patch} (100%)
 rename patches/server/{0075-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch => 0074-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch} (100%)
 rename patches/server/{0076-Replace-game-rules-map-with-optimized-collection.patch => 0075-Replace-game-rules-map-with-optimized-collection.patch} (100%)
 rename patches/server/{0077-Replace-class-map-with-optimized-collection.patch => 0076-Replace-class-map-with-optimized-collection.patch} (100%)
 rename patches/server/{0078-Replace-throttle-tracker-map-with-optimized-collecti.patch => 0077-Replace-throttle-tracker-map-with-optimized-collecti.patch} (100%)
 rename patches/server/{0079-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch => 0078-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch} (100%)
 rename patches/server/{0080-Cache-BlockStatePairKey-hash.patch => 0079-Cache-BlockStatePairKey-hash.patch} (100%)
 rename patches/server/{0081-Replace-division-by-multiplication-in-CubePointRange.patch => 0080-Replace-division-by-multiplication-in-CubePointRange.patch} (100%)
 rename patches/server/{0082-Replace-parts-by-size-in-CubePointRange.patch => 0081-Replace-parts-by-size-in-CubePointRange.patch} (100%)
 rename patches/server/{0083-Check-frozen-ticks-before-landing-block.patch => 0082-Check-frozen-ticks-before-landing-block.patch} (100%)
 rename patches/server/{0084-Faster-chunk-serialization.patch => 0083-Faster-chunk-serialization.patch} (100%)
 rename patches/server/{0085-Update-boss-bar-within-tick.patch => 0084-Update-boss-bar-within-tick.patch} (100%)
 rename patches/server/{0086-Cache-ominous-banner-item.patch => 0085-Cache-ominous-banner-item.patch} (100%)
 rename patches/server/{0087-Cache-world-generator-sea-level.patch => 0086-Cache-world-generator-sea-level.patch} (100%)
 rename patches/server/{0088-Skip-secondary-POI-sensor-if-absent.patch => 0087-Skip-secondary-POI-sensor-if-absent.patch} (100%)
 rename patches/server/{0089-Optimize-villager-data-storage.patch => 0088-Optimize-villager-data-storage.patch} (100%)
 rename patches/server/{0090-Skip-entity-move-if-movement-is-zero.patch => 0089-Skip-entity-move-if-movement-is-zero.patch} (100%)
 rename patches/server/{0091-Store-mob-counts-in-an-array.patch => 0090-Store-mob-counts-in-an-array.patch} (100%)
 rename patches/server/{0092-Use-linked-map-for-entity-trackers.patch => 0091-Use-linked-map-for-entity-trackers.patch} (100%)
 rename patches/server/{0093-Optimize-noise-generation.patch => 0092-Optimize-noise-generation.patch} (100%)
 rename patches/server/{0094-Optimize-sheep-offspring-color.patch => 0093-Optimize-sheep-offspring-color.patch} (100%)
 rename patches/server/{0095-Hide-flames-on-entities-with-fire-resistance.patch => 0094-Hide-flames-on-entities-with-fire-resistance.patch} (100%)
 rename patches/server/{0096-Skip-cloning-advancement-criteria.patch => 0095-Skip-cloning-advancement-criteria.patch} (100%)
 rename patches/server/{0097-Reduce-block-destruction-packet-allocations.patch => 0096-Reduce-block-destruction-packet-allocations.patch} (89%)
 rename patches/server/{0098-Spread-out-sending-all-player-info.patch => 0097-Spread-out-sending-all-player-info.patch} (100%)
 rename patches/server/{0099-Optimize-player-list-for-sending-player-info.patch => 0098-Optimize-player-list-for-sending-player-info.patch} (100%)
 rename patches/server/{0100-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch => 0099-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch} (100%)
 rename patches/server/{0101-Send-multiple-keep-alive-packets.patch => 0100-Send-multiple-keep-alive-packets.patch} (100%)
 rename patches/server/{0102-Make-slow-login-timeout-configurable.patch => 0101-Make-slow-login-timeout-configurable.patch} (100%)
 rename patches/server/{0103-Load-portal-destination-chunk-before-entity-teleport.patch => 0102-Load-portal-destination-chunk-before-entity-teleport.patch} (100%)
 rename patches/server/{0104-Don-t-load-chunks-to-spawn-phantoms.patch => 0103-Don-t-load-chunks-to-spawn-phantoms.patch} (100%)
 rename patches/server/{0105-Don-t-load-chunks-to-activate-climbing-entities.patch => 0104-Don-t-load-chunks-to-activate-climbing-entities.patch} (100%)
 rename patches/server/{0106-Broadcast-crit-animations-as-the-entity-being-critte.patch => 0105-Broadcast-crit-animations-as-the-entity-being-critte.patch} (100%)
 rename patches/server/{0107-Ignore-null-legacy-structure-data.patch => 0106-Ignore-null-legacy-structure-data.patch} (100%)
 rename patches/server/{0108-Skip-unnecessary-mob-spawning-computations.patch => 0107-Skip-unnecessary-mob-spawning-computations.patch} (90%)
 rename patches/server/{0109-Prevent-entities-random-strolling-into-non-ticking-c.patch => 0108-Prevent-entities-random-strolling-into-non-ticking-c.patch} (100%)
 rename patches/server/{0110-Do-not-place-player-in-world-if-kicked-before-being-.patch => 0109-Do-not-place-player-in-world-if-kicked-before-being-.patch} (100%)
 rename patches/server/{0111-CraftBukkit-UUID-to-world-map.patch => 0110-CraftBukkit-UUID-to-world-map.patch} (100%)
 rename patches/server/{0112-Global-EULA-file.patch => 0111-Global-EULA-file.patch} (100%)
 rename patches/server/{0113-Specific-interval-TPS-API.patch => 0112-Specific-interval-TPS-API.patch} (100%)
 rename patches/server/{0114-5-second-TPS-average.patch => 0113-5-second-TPS-average.patch} (100%)
 rename patches/server/{0115-Measure-last-tick-time.patch => 0114-Measure-last-tick-time.patch} (100%)
 rename patches/server/{0116-Last-tick-time-API.patch => 0115-Last-tick-time-API.patch} (100%)
 rename patches/server/{0117-Show-last-tick-time-in-tps-command.patch => 0116-Show-last-tick-time-in-tps-command.patch} (100%)
 rename patches/server/{0118-Increase-time-statistics-in-intervals.patch => 0117-Increase-time-statistics-in-intervals.patch} (100%)
 rename patches/server/{0119-For-collision-check-has-physics-before-same-vehicle.patch => 0118-For-collision-check-has-physics-before-same-vehicle.patch} (100%)
 rename patches/server/{0120-Skip-negligible-planar-movement-multiplication.patch => 0119-Skip-negligible-planar-movement-multiplication.patch} (100%)
 rename patches/server/{0121-Optimize-matching-item-checks.patch => 0120-Optimize-matching-item-checks.patch} (100%)
 rename patches/server/{0122-Pre-compute-VarLong-sizes.patch => 0121-Pre-compute-VarLong-sizes.patch} (100%)
 rename patches/server/{0123-Optimize-VarInt-write-and-VarLong-write.patch => 0122-Optimize-VarInt-write-and-VarLong-write.patch} (100%)
 rename patches/server/{0124-Reduce-RandomSource-instances.patch => 0123-Reduce-RandomSource-instances.patch} (100%)
 rename patches/server/{0125-Add-xor-shift-random.patch => 0124-Add-xor-shift-random.patch} (100%)
 rename patches/server/{0126-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch => 0125-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch} (100%)
 rename patches/server/{0127-Initialize-line-of-sight-cache-with-low-capacity.patch => 0126-Initialize-line-of-sight-cache-with-low-capacity.patch} (100%)
 rename patches/server/{0128-Reduce-line-of-sight-updates-and-cache-lookups.patch => 0127-Reduce-line-of-sight-updates-and-cache-lookups.patch} (100%)
 rename patches/server/{0129-Server-thread-priority-environment-variable.patch => 0128-Server-thread-priority-environment-variable.patch} (100%)
 rename patches/server/{0130-Virtual-thread-support.patch => 0129-Virtual-thread-support.patch} (100%)

diff --git a/patches/server/0023-Optimize-random-calls-in-chunk-ticking.patch b/patches/removed/server/0023-Optimize-random-calls-in-chunk-ticking.patch
similarity index 99%
rename from patches/server/0023-Optimize-random-calls-in-chunk-ticking.patch
rename to patches/removed/server/0023-Optimize-random-calls-in-chunk-ticking.patch
index c5eb1c5..80b69a7 100644
--- a/patches/server/0023-Optimize-random-calls-in-chunk-ticking.patch
+++ b/patches/removed/server/0023-Optimize-random-calls-in-chunk-ticking.patch
@@ -3,6 +3,8 @@ From: Martijn Muijsers <martijnmuijsers@live.nl>
 Date: Wed, 23 Nov 2022 16:45:45 +0100
 Subject: [PATCH] Optimize random calls in chunk ticking
 
+Removed since 1.21
+
 License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
diff --git a/patches/server/0024-Reduce-enderman-teleport-chunk-lookups.patch b/patches/server/0023-Reduce-enderman-teleport-chunk-lookups.patch
similarity index 100%
rename from patches/server/0024-Reduce-enderman-teleport-chunk-lookups.patch
rename to patches/server/0023-Reduce-enderman-teleport-chunk-lookups.patch
diff --git a/patches/server/0025-Reduce-acquire-POI-for-stuck-entities.patch b/patches/server/0024-Reduce-acquire-POI-for-stuck-entities.patch
similarity index 100%
rename from patches/server/0025-Reduce-acquire-POI-for-stuck-entities.patch
rename to patches/server/0024-Reduce-acquire-POI-for-stuck-entities.patch
diff --git a/patches/server/0026-Remove-iterators-from-Inventory-contains.patch b/patches/server/0025-Remove-iterators-from-Inventory-contains.patch
similarity index 100%
rename from patches/server/0026-Remove-iterators-from-Inventory-contains.patch
rename to patches/server/0025-Remove-iterators-from-Inventory-contains.patch
diff --git a/patches/server/0027-Check-targeting-range-before-getting-visibility.patch b/patches/server/0026-Check-targeting-range-before-getting-visibility.patch
similarity index 100%
rename from patches/server/0027-Check-targeting-range-before-getting-visibility.patch
rename to patches/server/0026-Check-targeting-range-before-getting-visibility.patch
diff --git a/patches/server/0028-Print-stack-trace-for-plugins-not-shutting-down-task.patch b/patches/server/0027-Print-stack-trace-for-plugins-not-shutting-down-task.patch
similarity index 100%
rename from patches/server/0028-Print-stack-trace-for-plugins-not-shutting-down-task.patch
rename to patches/server/0027-Print-stack-trace-for-plugins-not-shutting-down-task.patch
diff --git a/patches/server/0029-Improve-fluid-direction-caching.patch b/patches/server/0028-Improve-fluid-direction-caching.patch
similarity index 100%
rename from patches/server/0029-Improve-fluid-direction-caching.patch
rename to patches/server/0028-Improve-fluid-direction-caching.patch
diff --git a/patches/server/0030-Cache-on-climbable-check.patch b/patches/server/0029-Cache-on-climbable-check.patch
similarity index 100%
rename from patches/server/0030-Cache-on-climbable-check.patch
rename to patches/server/0029-Cache-on-climbable-check.patch
diff --git a/patches/server/0031-Make-EntityCollisionContext-a-live-representation.patch b/patches/server/0030-Make-EntityCollisionContext-a-live-representation.patch
similarity index 100%
rename from patches/server/0031-Make-EntityCollisionContext-a-live-representation.patch
rename to patches/server/0030-Make-EntityCollisionContext-a-live-representation.patch
diff --git a/patches/server/0032-Improve-container-checking-with-a-bitset.patch b/patches/server/0031-Improve-container-checking-with-a-bitset.patch
similarity index 100%
rename from patches/server/0032-Improve-container-checking-with-a-bitset.patch
rename to patches/server/0031-Improve-container-checking-with-a-bitset.patch
diff --git a/patches/server/0033-Better-checking-for-useless-move-packets.patch b/patches/server/0032-Better-checking-for-useless-move-packets.patch
similarity index 100%
rename from patches/server/0033-Better-checking-for-useless-move-packets.patch
rename to patches/server/0032-Better-checking-for-useless-move-packets.patch
diff --git a/patches/server/0034-Inline-level-height.patch b/patches/server/0033-Inline-level-height.patch
similarity index 100%
rename from patches/server/0034-Inline-level-height.patch
rename to patches/server/0033-Inline-level-height.patch
diff --git a/patches/server/0035-Remove-streams-and-iterators-from-range-check.patch b/patches/server/0034-Remove-streams-and-iterators-from-range-check.patch
similarity index 100%
rename from patches/server/0035-Remove-streams-and-iterators-from-range-check.patch
rename to patches/server/0034-Remove-streams-and-iterators-from-range-check.patch
diff --git a/patches/server/0036-Block-goal-does-not-load-chunks.patch b/patches/server/0035-Block-goal-does-not-load-chunks.patch
similarity index 100%
rename from patches/server/0036-Block-goal-does-not-load-chunks.patch
rename to patches/server/0035-Block-goal-does-not-load-chunks.patch
diff --git a/patches/server/0037-Reduce-entity-allocations.patch b/patches/server/0036-Reduce-entity-allocations.patch
similarity index 100%
rename from patches/server/0037-Reduce-entity-allocations.patch
rename to patches/server/0036-Reduce-entity-allocations.patch
diff --git a/patches/server/0038-Remove-lambda-from-ticking-guard.patch b/patches/server/0037-Remove-lambda-from-ticking-guard.patch
similarity index 98%
rename from patches/server/0038-Remove-lambda-from-ticking-guard.patch
rename to patches/server/0037-Remove-lambda-from-ticking-guard.patch
index d08b510..6a852c6 100644
--- a/patches/server/0038-Remove-lambda-from-ticking-guard.patch
+++ b/patches/server/0037-Remove-lambda-from-ticking-guard.patch
@@ -31,7 +31,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c7c83e99d0683ef6d057e56d1adc6d68424329a2..997d6fa7651be19553d055cf6f33fed556ab383b 100644
+index f027997cb227bbadf6000ddb236fa6622304216d..8b8dbaf0a2cb8cb39bf178edb1a78f60f2043096 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -741,7 +741,20 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
diff --git a/patches/server/0039-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0038-Reduce-entity-fluid-lookups-if-no-fluids.patch
similarity index 100%
rename from patches/server/0039-Reduce-entity-fluid-lookups-if-no-fluids.patch
rename to patches/server/0038-Reduce-entity-fluid-lookups-if-no-fluids.patch
diff --git a/patches/server/0040-SIMD-support.patch b/patches/server/0039-SIMD-support.patch
similarity index 100%
rename from patches/server/0040-SIMD-support.patch
rename to patches/server/0039-SIMD-support.patch
diff --git a/patches/server/0041-Make-book-writing-configurable.patch b/patches/server/0040-Make-book-writing-configurable.patch
similarity index 100%
rename from patches/server/0041-Make-book-writing-configurable.patch
rename to patches/server/0040-Make-book-writing-configurable.patch
diff --git a/patches/server/0042-Optimize-entity-coordinate-key.patch b/patches/server/0041-Optimize-entity-coordinate-key.patch
similarity index 100%
rename from patches/server/0042-Optimize-entity-coordinate-key.patch
rename to patches/server/0041-Optimize-entity-coordinate-key.patch
diff --git a/patches/server/0043-Reduce-in-wall-checks.patch b/patches/server/0042-Reduce-in-wall-checks.patch
similarity index 100%
rename from patches/server/0043-Reduce-in-wall-checks.patch
rename to patches/server/0042-Reduce-in-wall-checks.patch
diff --git a/patches/server/0044-Make-chat-order-verification-configurable.patch b/patches/server/0043-Make-chat-order-verification-configurable.patch
similarity index 100%
rename from patches/server/0044-Make-chat-order-verification-configurable.patch
rename to patches/server/0043-Make-chat-order-verification-configurable.patch
diff --git a/patches/server/0045-Make-ender-dragon-respawn-attempt-after-placing-end-.patch b/patches/server/0044-Make-ender-dragon-respawn-attempt-after-placing-end-.patch
similarity index 100%
rename from patches/server/0045-Make-ender-dragon-respawn-attempt-after-placing-end-.patch
rename to patches/server/0044-Make-ender-dragon-respawn-attempt-after-placing-end-.patch
diff --git a/patches/server/0046-Make-saving-fireworks-configurable.patch b/patches/server/0045-Make-saving-fireworks-configurable.patch
similarity index 100%
rename from patches/server/0046-Make-saving-fireworks-configurable.patch
rename to patches/server/0045-Make-saving-fireworks-configurable.patch
diff --git a/patches/server/0047-Reduce-hopper-item-checks.patch b/patches/server/0046-Reduce-hopper-item-checks.patch
similarity index 100%
rename from patches/server/0047-Reduce-hopper-item-checks.patch
rename to patches/server/0046-Reduce-hopper-item-checks.patch
diff --git a/patches/server/0048-Reduce-villager-item-re-pickup.patch b/patches/server/0047-Reduce-villager-item-re-pickup.patch
similarity index 100%
rename from patches/server/0048-Reduce-villager-item-re-pickup.patch
rename to patches/server/0047-Reduce-villager-item-re-pickup.patch
diff --git a/patches/server/0049-Variable-entity-wake-up-duration.patch b/patches/server/0048-Variable-entity-wake-up-duration.patch
similarity index 100%
rename from patches/server/0049-Variable-entity-wake-up-duration.patch
rename to patches/server/0048-Variable-entity-wake-up-duration.patch
diff --git a/patches/server/0050-Do-not-process-chat-commands-before-player-has-joine.patch b/patches/server/0049-Do-not-process-chat-commands-before-player-has-joine.patch
similarity index 100%
rename from patches/server/0050-Do-not-process-chat-commands-before-player-has-joine.patch
rename to patches/server/0049-Do-not-process-chat-commands-before-player-has-joine.patch
diff --git a/patches/server/0051-Do-not-log-invalid-statistics.patch b/patches/server/0050-Do-not-log-invalid-statistics.patch
similarity index 100%
rename from patches/server/0051-Do-not-log-invalid-statistics.patch
rename to patches/server/0050-Do-not-log-invalid-statistics.patch
diff --git a/patches/server/0052-Do-not-log-empty-message-warnings.patch b/patches/server/0051-Do-not-log-empty-message-warnings.patch
similarity index 100%
rename from patches/server/0052-Do-not-log-empty-message-warnings.patch
rename to patches/server/0051-Do-not-log-empty-message-warnings.patch
diff --git a/patches/server/0053-Do-not-log-ignored-advancements.patch b/patches/server/0052-Do-not-log-ignored-advancements.patch
similarity index 100%
rename from patches/server/0053-Do-not-log-ignored-advancements.patch
rename to patches/server/0052-Do-not-log-ignored-advancements.patch
diff --git a/patches/server/0054-Do-not-log-setBlock-in-far-chunks.patch b/patches/server/0053-Do-not-log-setBlock-in-far-chunks.patch
similarity index 100%
rename from patches/server/0054-Do-not-log-setBlock-in-far-chunks.patch
rename to patches/server/0053-Do-not-log-setBlock-in-far-chunks.patch
diff --git a/patches/server/0055-Do-not-log-unrecognized-recipes.patch b/patches/server/0054-Do-not-log-unrecognized-recipes.patch
similarity index 100%
rename from patches/server/0055-Do-not-log-unrecognized-recipes.patch
rename to patches/server/0054-Do-not-log-unrecognized-recipes.patch
diff --git a/patches/server/0056-Do-not-log-legacy-Material-initialization.patch b/patches/server/0055-Do-not-log-legacy-Material-initialization.patch
similarity index 100%
rename from patches/server/0056-Do-not-log-legacy-Material-initialization.patch
rename to patches/server/0055-Do-not-log-legacy-Material-initialization.patch
diff --git a/patches/server/0057-Do-not-log-plugin-library-loads.patch b/patches/server/0056-Do-not-log-plugin-library-loads.patch
similarity index 100%
rename from patches/server/0057-Do-not-log-plugin-library-loads.patch
rename to patches/server/0056-Do-not-log-plugin-library-loads.patch
diff --git a/patches/server/0058-Do-not-log-expired-message-warnings.patch b/patches/server/0057-Do-not-log-expired-message-warnings.patch
similarity index 100%
rename from patches/server/0058-Do-not-log-expired-message-warnings.patch
rename to patches/server/0057-Do-not-log-expired-message-warnings.patch
diff --git a/patches/server/0059-Do-not-log-Not-Secure-marker.patch b/patches/server/0058-Do-not-log-Not-Secure-marker.patch
similarity index 100%
rename from patches/server/0059-Do-not-log-Not-Secure-marker.patch
rename to patches/server/0058-Do-not-log-Not-Secure-marker.patch
diff --git a/patches/server/0060-Do-not-log-disconnections-with-null-id.patch b/patches/server/0059-Do-not-log-disconnections-with-null-id.patch
similarity index 100%
rename from patches/server/0060-Do-not-log-disconnections-with-null-id.patch
rename to patches/server/0059-Do-not-log-disconnections-with-null-id.patch
diff --git a/patches/server/0061-Do-not-log-run-as-root-warning.patch b/patches/server/0060-Do-not-log-run-as-root-warning.patch
similarity index 100%
rename from patches/server/0061-Do-not-log-run-as-root-warning.patch
rename to patches/server/0060-Do-not-log-run-as-root-warning.patch
diff --git a/patches/server/0062-Do-not-log-offline-mode-warning.patch b/patches/server/0061-Do-not-log-offline-mode-warning.patch
similarity index 100%
rename from patches/server/0062-Do-not-log-offline-mode-warning.patch
rename to patches/server/0061-Do-not-log-offline-mode-warning.patch
diff --git a/patches/server/0063-Softly-log-invalid-pool-element-errors.patch b/patches/server/0062-Softly-log-invalid-pool-element-errors.patch
similarity index 100%
rename from patches/server/0063-Softly-log-invalid-pool-element-errors.patch
rename to patches/server/0062-Softly-log-invalid-pool-element-errors.patch
diff --git a/patches/server/0064-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0063-Fix-outdated-server-showing-in-ping-before-server-fu.patch
similarity index 100%
rename from patches/server/0064-Fix-outdated-server-showing-in-ping-before-server-fu.patch
rename to patches/server/0063-Fix-outdated-server-showing-in-ping-before-server-fu.patch
diff --git a/patches/server/0065-Fix-MC-238526.patch b/patches/server/0064-Fix-MC-238526.patch
similarity index 100%
rename from patches/server/0065-Fix-MC-238526.patch
rename to patches/server/0064-Fix-MC-238526.patch
diff --git a/patches/server/0066-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0065-Fix-cow-rotation-when-shearing-mooshroom.patch
similarity index 100%
rename from patches/server/0066-Fix-cow-rotation-when-shearing-mooshroom.patch
rename to patches/server/0065-Fix-cow-rotation-when-shearing-mooshroom.patch
diff --git a/patches/server/0067-Fix-MC-121706.patch b/patches/server/0066-Fix-MC-121706.patch
similarity index 100%
rename from patches/server/0067-Fix-MC-121706.patch
rename to patches/server/0066-Fix-MC-121706.patch
diff --git a/patches/server/0068-Fix-MC-110386.patch b/patches/server/0067-Fix-MC-110386.patch
similarity index 100%
rename from patches/server/0068-Fix-MC-110386.patch
rename to patches/server/0067-Fix-MC-110386.patch
diff --git a/patches/server/0069-Fix-MC-31819.patch b/patches/server/0068-Fix-MC-31819.patch
similarity index 100%
rename from patches/server/0069-Fix-MC-31819.patch
rename to patches/server/0068-Fix-MC-31819.patch
diff --git a/patches/server/0070-Fix-MC-26304.patch b/patches/server/0069-Fix-MC-26304.patch
similarity index 100%
rename from patches/server/0070-Fix-MC-26304.patch
rename to patches/server/0069-Fix-MC-26304.patch
diff --git a/patches/server/0071-Make-arrow-movement-resetting-despawn-counter-config.patch b/patches/server/0070-Make-arrow-movement-resetting-despawn-counter-config.patch
similarity index 100%
rename from patches/server/0071-Make-arrow-movement-resetting-despawn-counter-config.patch
rename to patches/server/0070-Make-arrow-movement-resetting-despawn-counter-config.patch
diff --git a/patches/server/0072-Make-logging-login-locations-configurable.patch b/patches/server/0071-Make-logging-login-locations-configurable.patch
similarity index 100%
rename from patches/server/0072-Make-logging-login-locations-configurable.patch
rename to patches/server/0071-Make-logging-login-locations-configurable.patch
diff --git a/patches/server/0073-Reduce-array-allocations.patch b/patches/server/0072-Reduce-array-allocations.patch
similarity index 100%
rename from patches/server/0073-Reduce-array-allocations.patch
rename to patches/server/0072-Reduce-array-allocations.patch
diff --git a/patches/server/0074-Optimize-sun-burn-tick.patch b/patches/server/0073-Optimize-sun-burn-tick.patch
similarity index 100%
rename from patches/server/0074-Optimize-sun-burn-tick.patch
rename to patches/server/0073-Optimize-sun-burn-tick.patch
diff --git a/patches/server/0075-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0074-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
similarity index 100%
rename from patches/server/0075-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
rename to patches/server/0074-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
diff --git a/patches/server/0076-Replace-game-rules-map-with-optimized-collection.patch b/patches/server/0075-Replace-game-rules-map-with-optimized-collection.patch
similarity index 100%
rename from patches/server/0076-Replace-game-rules-map-with-optimized-collection.patch
rename to patches/server/0075-Replace-game-rules-map-with-optimized-collection.patch
diff --git a/patches/server/0077-Replace-class-map-with-optimized-collection.patch b/patches/server/0076-Replace-class-map-with-optimized-collection.patch
similarity index 100%
rename from patches/server/0077-Replace-class-map-with-optimized-collection.patch
rename to patches/server/0076-Replace-class-map-with-optimized-collection.patch
diff --git a/patches/server/0078-Replace-throttle-tracker-map-with-optimized-collecti.patch b/patches/server/0077-Replace-throttle-tracker-map-with-optimized-collecti.patch
similarity index 100%
rename from patches/server/0078-Replace-throttle-tracker-map-with-optimized-collecti.patch
rename to patches/server/0077-Replace-throttle-tracker-map-with-optimized-collecti.patch
diff --git a/patches/server/0079-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0078-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
similarity index 100%
rename from patches/server/0079-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
rename to patches/server/0078-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
diff --git a/patches/server/0080-Cache-BlockStatePairKey-hash.patch b/patches/server/0079-Cache-BlockStatePairKey-hash.patch
similarity index 100%
rename from patches/server/0080-Cache-BlockStatePairKey-hash.patch
rename to patches/server/0079-Cache-BlockStatePairKey-hash.patch
diff --git a/patches/server/0081-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0080-Replace-division-by-multiplication-in-CubePointRange.patch
similarity index 100%
rename from patches/server/0081-Replace-division-by-multiplication-in-CubePointRange.patch
rename to patches/server/0080-Replace-division-by-multiplication-in-CubePointRange.patch
diff --git a/patches/server/0082-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0081-Replace-parts-by-size-in-CubePointRange.patch
similarity index 100%
rename from patches/server/0082-Replace-parts-by-size-in-CubePointRange.patch
rename to patches/server/0081-Replace-parts-by-size-in-CubePointRange.patch
diff --git a/patches/server/0083-Check-frozen-ticks-before-landing-block.patch b/patches/server/0082-Check-frozen-ticks-before-landing-block.patch
similarity index 100%
rename from patches/server/0083-Check-frozen-ticks-before-landing-block.patch
rename to patches/server/0082-Check-frozen-ticks-before-landing-block.patch
diff --git a/patches/server/0084-Faster-chunk-serialization.patch b/patches/server/0083-Faster-chunk-serialization.patch
similarity index 100%
rename from patches/server/0084-Faster-chunk-serialization.patch
rename to patches/server/0083-Faster-chunk-serialization.patch
diff --git a/patches/server/0085-Update-boss-bar-within-tick.patch b/patches/server/0084-Update-boss-bar-within-tick.patch
similarity index 100%
rename from patches/server/0085-Update-boss-bar-within-tick.patch
rename to patches/server/0084-Update-boss-bar-within-tick.patch
diff --git a/patches/server/0086-Cache-ominous-banner-item.patch b/patches/server/0085-Cache-ominous-banner-item.patch
similarity index 100%
rename from patches/server/0086-Cache-ominous-banner-item.patch
rename to patches/server/0085-Cache-ominous-banner-item.patch
diff --git a/patches/server/0087-Cache-world-generator-sea-level.patch b/patches/server/0086-Cache-world-generator-sea-level.patch
similarity index 100%
rename from patches/server/0087-Cache-world-generator-sea-level.patch
rename to patches/server/0086-Cache-world-generator-sea-level.patch
diff --git a/patches/server/0088-Skip-secondary-POI-sensor-if-absent.patch b/patches/server/0087-Skip-secondary-POI-sensor-if-absent.patch
similarity index 100%
rename from patches/server/0088-Skip-secondary-POI-sensor-if-absent.patch
rename to patches/server/0087-Skip-secondary-POI-sensor-if-absent.patch
diff --git a/patches/server/0089-Optimize-villager-data-storage.patch b/patches/server/0088-Optimize-villager-data-storage.patch
similarity index 100%
rename from patches/server/0089-Optimize-villager-data-storage.patch
rename to patches/server/0088-Optimize-villager-data-storage.patch
diff --git a/patches/server/0090-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0089-Skip-entity-move-if-movement-is-zero.patch
similarity index 100%
rename from patches/server/0090-Skip-entity-move-if-movement-is-zero.patch
rename to patches/server/0089-Skip-entity-move-if-movement-is-zero.patch
diff --git a/patches/server/0091-Store-mob-counts-in-an-array.patch b/patches/server/0090-Store-mob-counts-in-an-array.patch
similarity index 100%
rename from patches/server/0091-Store-mob-counts-in-an-array.patch
rename to patches/server/0090-Store-mob-counts-in-an-array.patch
diff --git a/patches/server/0092-Use-linked-map-for-entity-trackers.patch b/patches/server/0091-Use-linked-map-for-entity-trackers.patch
similarity index 100%
rename from patches/server/0092-Use-linked-map-for-entity-trackers.patch
rename to patches/server/0091-Use-linked-map-for-entity-trackers.patch
diff --git a/patches/server/0093-Optimize-noise-generation.patch b/patches/server/0092-Optimize-noise-generation.patch
similarity index 100%
rename from patches/server/0093-Optimize-noise-generation.patch
rename to patches/server/0092-Optimize-noise-generation.patch
diff --git a/patches/server/0094-Optimize-sheep-offspring-color.patch b/patches/server/0093-Optimize-sheep-offspring-color.patch
similarity index 100%
rename from patches/server/0094-Optimize-sheep-offspring-color.patch
rename to patches/server/0093-Optimize-sheep-offspring-color.patch
diff --git a/patches/server/0095-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0094-Hide-flames-on-entities-with-fire-resistance.patch
similarity index 100%
rename from patches/server/0095-Hide-flames-on-entities-with-fire-resistance.patch
rename to patches/server/0094-Hide-flames-on-entities-with-fire-resistance.patch
diff --git a/patches/server/0096-Skip-cloning-advancement-criteria.patch b/patches/server/0095-Skip-cloning-advancement-criteria.patch
similarity index 100%
rename from patches/server/0096-Skip-cloning-advancement-criteria.patch
rename to patches/server/0095-Skip-cloning-advancement-criteria.patch
diff --git a/patches/server/0097-Reduce-block-destruction-packet-allocations.patch b/patches/server/0096-Reduce-block-destruction-packet-allocations.patch
similarity index 89%
rename from patches/server/0097-Reduce-block-destruction-packet-allocations.patch
rename to patches/server/0096-Reduce-block-destruction-packet-allocations.patch
index 3834057..5da688b 100644
--- a/patches/server/0097-Reduce-block-destruction-packet-allocations.patch
+++ b/patches/server/0096-Reduce-block-destruction-packet-allocations.patch
@@ -13,10 +13,10 @@ As part of: SportPaper (https://github.com/Electroid/SportPaper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 997d6fa7651be19553d055cf6f33fed556ab383b..8bca5e1165e09e219386a787eb36fabcd948a0e6 100644
+index 8b8dbaf0a2cb8cb39bf178edb1a78f60f2043096..ec3edbfe8c9a7aef5a9f37fa1d2279acf4827660 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1602,7 +1602,17 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -1600,7 +1600,17 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
  
      @Override
      public void destroyBlockProgress(int entityId, BlockPos pos, int progress) {
@@ -35,7 +35,7 @@ index 997d6fa7651be19553d055cf6f33fed556ab383b..8bca5e1165e09e219386a787eb36fabc
  
          // CraftBukkit start
          Player entityhuman = null;
-@@ -1636,7 +1646,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -1634,7 +1644,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
                  // CraftBukkit end
  
                  if (d0 * d0 + d1 * d1 + d2 * d2 < 1024.0D) {
diff --git a/patches/server/0098-Spread-out-sending-all-player-info.patch b/patches/server/0097-Spread-out-sending-all-player-info.patch
similarity index 100%
rename from patches/server/0098-Spread-out-sending-all-player-info.patch
rename to patches/server/0097-Spread-out-sending-all-player-info.patch
diff --git a/patches/server/0099-Optimize-player-list-for-sending-player-info.patch b/patches/server/0098-Optimize-player-list-for-sending-player-info.patch
similarity index 100%
rename from patches/server/0099-Optimize-player-list-for-sending-player-info.patch
rename to patches/server/0098-Optimize-player-list-for-sending-player-info.patch
diff --git a/patches/server/0100-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0099-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
similarity index 100%
rename from patches/server/0100-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
rename to patches/server/0099-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
diff --git a/patches/server/0101-Send-multiple-keep-alive-packets.patch b/patches/server/0100-Send-multiple-keep-alive-packets.patch
similarity index 100%
rename from patches/server/0101-Send-multiple-keep-alive-packets.patch
rename to patches/server/0100-Send-multiple-keep-alive-packets.patch
diff --git a/patches/server/0102-Make-slow-login-timeout-configurable.patch b/patches/server/0101-Make-slow-login-timeout-configurable.patch
similarity index 100%
rename from patches/server/0102-Make-slow-login-timeout-configurable.patch
rename to patches/server/0101-Make-slow-login-timeout-configurable.patch
diff --git a/patches/server/0103-Load-portal-destination-chunk-before-entity-teleport.patch b/patches/server/0102-Load-portal-destination-chunk-before-entity-teleport.patch
similarity index 100%
rename from patches/server/0103-Load-portal-destination-chunk-before-entity-teleport.patch
rename to patches/server/0102-Load-portal-destination-chunk-before-entity-teleport.patch
diff --git a/patches/server/0104-Don-t-load-chunks-to-spawn-phantoms.patch b/patches/server/0103-Don-t-load-chunks-to-spawn-phantoms.patch
similarity index 100%
rename from patches/server/0104-Don-t-load-chunks-to-spawn-phantoms.patch
rename to patches/server/0103-Don-t-load-chunks-to-spawn-phantoms.patch
diff --git a/patches/server/0105-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0104-Don-t-load-chunks-to-activate-climbing-entities.patch
similarity index 100%
rename from patches/server/0105-Don-t-load-chunks-to-activate-climbing-entities.patch
rename to patches/server/0104-Don-t-load-chunks-to-activate-climbing-entities.patch
diff --git a/patches/server/0106-Broadcast-crit-animations-as-the-entity-being-critte.patch b/patches/server/0105-Broadcast-crit-animations-as-the-entity-being-critte.patch
similarity index 100%
rename from patches/server/0106-Broadcast-crit-animations-as-the-entity-being-critte.patch
rename to patches/server/0105-Broadcast-crit-animations-as-the-entity-being-critte.patch
diff --git a/patches/server/0107-Ignore-null-legacy-structure-data.patch b/patches/server/0106-Ignore-null-legacy-structure-data.patch
similarity index 100%
rename from patches/server/0107-Ignore-null-legacy-structure-data.patch
rename to patches/server/0106-Ignore-null-legacy-structure-data.patch
diff --git a/patches/server/0108-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0107-Skip-unnecessary-mob-spawning-computations.patch
similarity index 90%
rename from patches/server/0108-Skip-unnecessary-mob-spawning-computations.patch
rename to patches/server/0107-Skip-unnecessary-mob-spawning-computations.patch
index 80f8fc9..8c4ad38 100644
--- a/patches/server/0108-Skip-unnecessary-mob-spawning-computations.patch
+++ b/patches/server/0107-Skip-unnecessary-mob-spawning-computations.patch
@@ -13,12 +13,12 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 4c4f4d862b898837e498486ae9e710891158702e..105e3b989440380e8c917075c335f58a96a5dde9 100644
+index ccd6a21e502bfd25a0a84fdf1b6d6f2606cf7156..3b81ba4c283e474493e9bc97bbfa230a7878cdbc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -432,11 +432,16 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
+@@ -431,11 +431,16 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
+             }
  
-             this.level.resetIceAndSnowTick(); // Gale - Airplane - optimize random calls in chunk ticking - reset ice & snow tick random
              if (this.level.tickRateManager().runsNormally()) {
 +                // Gale start - MultiPaper - skip unnecessary mob spawning computations
 +                NaturalSpawner.SpawnState spawnercreature_d; // moved down
@@ -34,7 +34,7 @@ index 4c4f4d862b898837e498486ae9e710891158702e..105e3b989440380e8c917075c335f58a
                  if ((this.spawnFriendlies || this.spawnEnemies) && this.level.paperConfig().entities.spawning.perPlayerMobSpawns) { // don't count mobs when animals and monsters are disabled
                      // re-set mob counts
                      for (ServerPlayer player : this.level.players) {
-@@ -460,7 +465,11 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
+@@ -459,7 +464,11 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
                  this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings
  
                  this.lastSpawnState = spawnercreature_d;
@@ -47,7 +47,7 @@ index 4c4f4d862b898837e498486ae9e710891158702e..105e3b989440380e8c917075c335f58a
  
                  Util.shuffle(list, this.level.random);
                  // Paper start - PlayerNaturallySpawnCreaturesEvent
-@@ -483,7 +492,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
+@@ -482,7 +491,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
  
                      if (this.level.isNaturalSpawningAllowed(chunkcoordintpair) && this.chunkMap.anyPlayerCloseEnoughForSpawning(chunkcoordintpair)) {
                          chunk1.incrementInhabitedTime(j);
@@ -56,7 +56,7 @@ index 4c4f4d862b898837e498486ae9e710891158702e..105e3b989440380e8c917075c335f58a
                              NaturalSpawner.spawnForChunk(this.level, chunk1, spawnercreature_d, this.spawnFriendlies, this.spawnEnemies, flag1);
                          }
  
-@@ -514,6 +523,20 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
+@@ -513,6 +522,20 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
          }
      }
  
diff --git a/patches/server/0109-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0108-Prevent-entities-random-strolling-into-non-ticking-c.patch
similarity index 100%
rename from patches/server/0109-Prevent-entities-random-strolling-into-non-ticking-c.patch
rename to patches/server/0108-Prevent-entities-random-strolling-into-non-ticking-c.patch
diff --git a/patches/server/0110-Do-not-place-player-in-world-if-kicked-before-being-.patch b/patches/server/0109-Do-not-place-player-in-world-if-kicked-before-being-.patch
similarity index 100%
rename from patches/server/0110-Do-not-place-player-in-world-if-kicked-before-being-.patch
rename to patches/server/0109-Do-not-place-player-in-world-if-kicked-before-being-.patch
diff --git a/patches/server/0111-CraftBukkit-UUID-to-world-map.patch b/patches/server/0110-CraftBukkit-UUID-to-world-map.patch
similarity index 100%
rename from patches/server/0111-CraftBukkit-UUID-to-world-map.patch
rename to patches/server/0110-CraftBukkit-UUID-to-world-map.patch
diff --git a/patches/server/0112-Global-EULA-file.patch b/patches/server/0111-Global-EULA-file.patch
similarity index 100%
rename from patches/server/0112-Global-EULA-file.patch
rename to patches/server/0111-Global-EULA-file.patch
diff --git a/patches/server/0113-Specific-interval-TPS-API.patch b/patches/server/0112-Specific-interval-TPS-API.patch
similarity index 100%
rename from patches/server/0113-Specific-interval-TPS-API.patch
rename to patches/server/0112-Specific-interval-TPS-API.patch
diff --git a/patches/server/0114-5-second-TPS-average.patch b/patches/server/0113-5-second-TPS-average.patch
similarity index 100%
rename from patches/server/0114-5-second-TPS-average.patch
rename to patches/server/0113-5-second-TPS-average.patch
diff --git a/patches/server/0115-Measure-last-tick-time.patch b/patches/server/0114-Measure-last-tick-time.patch
similarity index 100%
rename from patches/server/0115-Measure-last-tick-time.patch
rename to patches/server/0114-Measure-last-tick-time.patch
diff --git a/patches/server/0116-Last-tick-time-API.patch b/patches/server/0115-Last-tick-time-API.patch
similarity index 100%
rename from patches/server/0116-Last-tick-time-API.patch
rename to patches/server/0115-Last-tick-time-API.patch
diff --git a/patches/server/0117-Show-last-tick-time-in-tps-command.patch b/patches/server/0116-Show-last-tick-time-in-tps-command.patch
similarity index 100%
rename from patches/server/0117-Show-last-tick-time-in-tps-command.patch
rename to patches/server/0116-Show-last-tick-time-in-tps-command.patch
diff --git a/patches/server/0118-Increase-time-statistics-in-intervals.patch b/patches/server/0117-Increase-time-statistics-in-intervals.patch
similarity index 100%
rename from patches/server/0118-Increase-time-statistics-in-intervals.patch
rename to patches/server/0117-Increase-time-statistics-in-intervals.patch
diff --git a/patches/server/0119-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0118-For-collision-check-has-physics-before-same-vehicle.patch
similarity index 100%
rename from patches/server/0119-For-collision-check-has-physics-before-same-vehicle.patch
rename to patches/server/0118-For-collision-check-has-physics-before-same-vehicle.patch
diff --git a/patches/server/0120-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0119-Skip-negligible-planar-movement-multiplication.patch
similarity index 100%
rename from patches/server/0120-Skip-negligible-planar-movement-multiplication.patch
rename to patches/server/0119-Skip-negligible-planar-movement-multiplication.patch
diff --git a/patches/server/0121-Optimize-matching-item-checks.patch b/patches/server/0120-Optimize-matching-item-checks.patch
similarity index 100%
rename from patches/server/0121-Optimize-matching-item-checks.patch
rename to patches/server/0120-Optimize-matching-item-checks.patch
diff --git a/patches/server/0122-Pre-compute-VarLong-sizes.patch b/patches/server/0121-Pre-compute-VarLong-sizes.patch
similarity index 100%
rename from patches/server/0122-Pre-compute-VarLong-sizes.patch
rename to patches/server/0121-Pre-compute-VarLong-sizes.patch
diff --git a/patches/server/0123-Optimize-VarInt-write-and-VarLong-write.patch b/patches/server/0122-Optimize-VarInt-write-and-VarLong-write.patch
similarity index 100%
rename from patches/server/0123-Optimize-VarInt-write-and-VarLong-write.patch
rename to patches/server/0122-Optimize-VarInt-write-and-VarLong-write.patch
diff --git a/patches/server/0124-Reduce-RandomSource-instances.patch b/patches/server/0123-Reduce-RandomSource-instances.patch
similarity index 100%
rename from patches/server/0124-Reduce-RandomSource-instances.patch
rename to patches/server/0123-Reduce-RandomSource-instances.patch
diff --git a/patches/server/0125-Add-xor-shift-random.patch b/patches/server/0124-Add-xor-shift-random.patch
similarity index 100%
rename from patches/server/0125-Add-xor-shift-random.patch
rename to patches/server/0124-Add-xor-shift-random.patch
diff --git a/patches/server/0126-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch b/patches/server/0125-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch
similarity index 100%
rename from patches/server/0126-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch
rename to patches/server/0125-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch
diff --git a/patches/server/0127-Initialize-line-of-sight-cache-with-low-capacity.patch b/patches/server/0126-Initialize-line-of-sight-cache-with-low-capacity.patch
similarity index 100%
rename from patches/server/0127-Initialize-line-of-sight-cache-with-low-capacity.patch
rename to patches/server/0126-Initialize-line-of-sight-cache-with-low-capacity.patch
diff --git a/patches/server/0128-Reduce-line-of-sight-updates-and-cache-lookups.patch b/patches/server/0127-Reduce-line-of-sight-updates-and-cache-lookups.patch
similarity index 100%
rename from patches/server/0128-Reduce-line-of-sight-updates-and-cache-lookups.patch
rename to patches/server/0127-Reduce-line-of-sight-updates-and-cache-lookups.patch
diff --git a/patches/server/0129-Server-thread-priority-environment-variable.patch b/patches/server/0128-Server-thread-priority-environment-variable.patch
similarity index 100%
rename from patches/server/0129-Server-thread-priority-environment-variable.patch
rename to patches/server/0128-Server-thread-priority-environment-variable.patch
diff --git a/patches/server/0130-Virtual-thread-support.patch b/patches/server/0129-Virtual-thread-support.patch
similarity index 100%
rename from patches/server/0130-Virtual-thread-support.patch
rename to patches/server/0129-Virtual-thread-support.patch