From 4d37dc3a68909475bedcb62f94f15901342a8a76 Mon Sep 17 00:00:00 2001
From: Martijn Muijsers <martijnmuijsers@live.nl>
Date: Sat, 4 Feb 2023 13:03:29 +0100
Subject: [PATCH] Watch for blocking base threads

---
 .../0009-Include-time-in-startup-logs.patch   |  64 +++++++++++
 ...nclude-server.properties-in-timings.patch} |   0
 ...1-Include-hardware-specs-in-timings.patch} |   0
 ...tch => 0012-Use-timin.gs-by-default.patch} |   0
 ...ommend-disabling-timings-on-startup.patch} |   0
 ...ch => 0014-Make-timings-calls-final.patch} |   0
 ...tch => 0015-Remove-vanilla-profiler.patch} |   0
 ...ing-for-EntityLiving-hasLineOfSight.patch} |   2 +-
 ...pelessRecipe-comparison-for-vanilla.patch} |   0
 ...018-Reduce-projectile-chunk-loading.patch} |   0
 ...een.patch => 0019-Predict-Halloween.patch} |   0
 ...tch => 0020-Move-random-tick-random.patch} |   0
 ...imize-random-calls-in-chunk-ticking.patch} |   0
 ...uce-enderman-teleport-chunk-lookups.patch} |   0
 ...duce-acquire-POI-for-stuck-entities.patch} |   0
 ...e-iterators-from-Inventory-contains.patch} |   0
 ...ing-range-before-getting-visibility.patch} |   0
 ...-for-plugins-not-shutting-down-task.patch} |   0
 ...027-Improve-fluid-direction-caching.patch} |   0
 ...ch => 0028-Cache-on-climbable-check.patch} |   4 +-
 ...0029-Use-array-for-gamerule-storage.patch} |   0
 ...lisionContext-a-live-representation.patch} |   0
 ...ve-container-checking-with-a-bitset.patch} |   2 +-
 ...r-checking-for-useless-move-packets.patch} |   0
 ...0033-Use-fast-item-merge-raytracing.patch} |   0
 ...-aging-cache-for-biome-temperatures.patch} |   0
 ...t.patch => 0035-Inline-level-height.patch} |   0
 ...ThreadUnsafeRandom-for-mob-spawning.patch} |   0
 ...eams-and-iterators-from-range-check.patch} |   0
 ...streams-from-getting-nearby-players.patch} |   2 +-
 ...> 0039-Skip-cloning-loot-parameters.patch} |   0
 ...040-Block-goal-does-not-load-chunks.patch} |   0
 ...h => 0041-Reduce-entity-allocations.patch} |   2 +-
 ...42-Remove-lambda-from-ticking-guard.patch} |   0
 ...e-entity-fluid-lookups-if-no-fluids.patch} |   2 +-
 ...-support.patch => 0044-SIMD-support.patch} |   2 +-
 ...0045-Make-book-writing-configurable.patch} |   2 +-
 ...0046-Optimize-entity-coordinate-key.patch} |   2 +-
 ...patch => 0047-Reduce-in-wall-checks.patch} |   2 +-
 ...hat-order-verification-configurable.patch} |   2 +-
 ...-Make-saving-fireworks-configurable.patch} |   0
 ...table-refresh-for-non-player-intera.patch} |   0
 ...h => 0051-Reduce-hopper-item-checks.patch} |   0
 ...0052-Reduce-villager-item-re-pickup.patch} |   0
 ...at-commands-before-player-has-joine.patch} |   4 +-
 ... 0054-Do-not-log-invalid-statistics.patch} |   0
 ...5-Do-not-log-empty-message-warnings.patch} |   2 +-
 ...056-Do-not-log-ignored-advancements.patch} |   0
 ...7-Do-not-log-setBlock-in-far-chunks.patch} |   0
 ...058-Do-not-log-unrecognized-recipes.patch} |   0
 ...-log-legacy-Material-initialization.patch} |   0
 ...Do-not-log-expired-message-warnings.patch} |   0
 ...t-log-out-of-order-message-warnings.patch} |   2 +-
 ...> 0062-Do-not-log-Not-Secure-marker.patch} |   0
 ...0063-Do-not-log-run-as-root-warning.patch} |   0
 ...064-Do-not-log-offline-mode-warning.patch} |   0
 ...tly-log-invalid-pool-element-errors.patch} |   0
 ...> 0066-Fix-legacy-colors-in-console.patch} |   0
 ...er-showing-in-ping-before-server-fu.patch} |   0
 ...8-Make-sand-duping-fix-configurable.patch} |   2 +-
 ...-238526.patch => 0069-Fix-MC-238526.patch} |   0
 ...-123848.patch => 0070-Fix-MC-123848.patch} |   0
 ...ow-rotation-when-shearing-mooshroom.patch} |   0
 ...-121706.patch => 0072-Fix-MC-121706.patch} |   0
 ...-110386.patch => 0073-Fix-MC-110386.patch} |   0
 ...MC-31819.patch => 0074-Fix-MC-31819.patch} |   0
 ...MC-26304.patch => 0075-Fix-MC-26304.patch} |   0
 ...ould-check-if-entity-can-use-portal.patch} |   0
 ...eating-blocks-in-non-ticking-chunks.patch} |   0
 ...nt-resetting-despawn-counter-config.patch} |   0
 ...ogging-login-locations-configurable.patch} |   0
 ...ch => 0080-Reduce-array-allocations.patch} |   0
 ...atch => 0081-Optimize-sun-burn-tick.patch} |   2 +-
 ...-Optional-allocation-in-EntityBased.patch} |   0
 ...-goal-set-with-optimized-collection.patch} |   0
 ...rules-map-with-optimized-collection.patch} |   0
 ...tributes-with-optimized-collections.patch} |   0
 ...class-map-with-optimized-collection.patch} |   0
 ...tracker-map-with-optimized-collecti.patch} |   0
 ...ape-full-block-cache-with-hashtable.patch} |   0
 ...ignableFrom-call-in-ClassInstanceMu.patch} |   0
 ...> 0090-Cache-BlockStatePairKey-hash.patch} |   0
 ...91-Cache-CubeVoxelShape-shape-array.patch} |   0
 ...by-multiplication-in-CubePointRange.patch} |   0
 ...ace-parts-by-size-in-CubePointRange.patch} |   0
 ...k-frozen-ticks-before-landing-block.patch} |   2 +-
 ... => 0095-Faster-chunk-serialization.patch} |   0
 ...=> 0096-Update-boss-bar-within-tick.patch} |   0
 ...h => 0097-Cache-ominous-banner-item.patch} |   0
 ...d-generation-chunk-and-block-access.patch} |   0
 ...099-Cache-world-generator-sea-level.patch} |   0
 ...Skip-secondary-POI-sensor-if-absent.patch} |   0
 ...0101-Optimize-villager-data-storage.patch} |   0
 ...kip-entity-move-if-movement-is-zero.patch} |   2 +-
 ...> 0103-Store-mob-counts-in-an-array.patch} |   0
 ...-Use-linked-map-for-entity-trackers.patch} |   0
 ...h => 0105-Optimize-noise-generation.patch} |   0
 ...0106-Optimize-sheep-offspring-color.patch} |   0
 ...durability-change-equipment-updates.patch} |   0
 ...es-on-entities-with-fire-resistance.patch} |   2 +-
 ...9-Skip-cloning-advancement-criteria.patch} |   0
 ...lock-destruction-packet-allocations.patch} |   0
 ...ation-packets-only-for-living-entit.patch} |   0
 ...> 0112-Player-canSee-by-entity-UUID.patch} |   0
 ...-Spread-out-sending-all-player-info.patch} |   0
 ...player-list-for-sending-player-info.patch} |   0
 ...dSendEvent-if-there-are-no-listener.patch} |   0
 ...16-Send-multiple-keep-alive-packets.patch} |   2 +-
 ...ake-slow-login-timeout-configurable.patch} |   2 +-
 ...x-interaction-distance-configurable.patch} |   2 +-
 ...nation-chunk-before-entity-teleport.patch} |   2 +-
 ...Don-t-load-chunks-to-spawn-phantoms.patch} |   0
 ...hunks-to-activate-climbing-entities.patch} |   4 +-
 ...imations-as-the-entity-being-critte.patch} |   0
 ...3-Ignore-null-legacy-structure-data.patch} |   0
 ...Don-t-double-save-stored-user-lists.patch} |   0
 ...necessary-mob-spawning-computations.patch} |   0
 ...random-strolling-into-non-ticking-c.patch} |   0
 ...er-in-world-if-kicked-before-being-.patch} |   2 +-
 ... 0128-CraftBukkit-UUID-to-world-map.patch} |   0
 ...file.patch => 0129-Global-EULA-file.patch} |   0
 ...h => 0130-Specific-interval-TPS-API.patch} |   0
 ....patch => 0131-5-second-TPS-average.patch} |   0
 ...atch => 0132-Measure-last-tick-time.patch} |   0
 ...PI.patch => 0133-Last-tick-time-API.patch} |   0
 ...-Show-last-tick-time-in-tps-command.patch} |   0
 ...crease-time-statistics-in-intervals.patch} |   0
 ...eck-has-physics-before-same-vehicle.patch} |   2 +-
 ...ible-planar-movement-multiplication.patch} |   2 +-
 ...0138-Optimize-identical-item-checks.patch} |   0
 ... 0139-Reduce-RandomSource-instances.patch} |   2 +-
 ...hread-priority-environment-variable.patch} |   0
 ...h => 0141-Thread-safety-annotations.patch} |   0
 ....patch => 0142-CPU-cores-estimation.patch} |   0
 ...utility.patch => 0143-Mutex-utility.patch} |   9 +-
 ...h => 0144-Thread-aware-lock-utility.patch} |   0
 ... 0145-Unterminable-executor-utility.patch} |   0
 ... 0146-FIFO-concurrent-queue-utility.patch} |   0
 ...pool.patch => 0147-Base-thread-pool.patch} |  26 +++--
 ...0148-Watch-for-blocking-base-threads.patch | 105 ++++++++++++++++++
 ... => 0149-Non-blocking-PooledObjects.patch} |   0
 ... => 0150-Yielding-memoized-Supplier.patch} |   0
 ...-executor-tasks-on-base-thread-pool.patch} |   0
 ...-executor-tasks-on-base-thread-pool.patch} |   0
 ...d-upgrade-tasks-on-base-thread-pool.patch} |   0
 ...ompletion-tasks-on-base-thread-pool.patch} |   0
 ...xt-filter-tasks-on-base-thread-pool.patch} |   0
 ...n-cleaner-tasks-on-base-thread-pool.patch} |   0
 ...unk-cache-tasks-on-base-thread-pool.patch} |   0
 ...ead-chunk-tasks-on-base-thread-pool.patch} |   0
 ...tisedQueueExecutorThread-agent-util.patch} |   0
 ...nk-worker-tasks-on-base-thread-pool.patch} |   0
 ...teps.patch => 0161-Split-tick-steps.patch} |   0
 ...patch => 0162-Multithreaded-ticking.patch} |   0
 154 files changed, 220 insertions(+), 46 deletions(-)
 create mode 100644 patches/server/0009-Include-time-in-startup-logs.patch
 rename patches/server/{0009-Include-server.properties-in-timings.patch => 0010-Include-server.properties-in-timings.patch} (100%)
 rename patches/server/{0010-Include-hardware-specs-in-timings.patch => 0011-Include-hardware-specs-in-timings.patch} (100%)
 rename patches/server/{0011-Use-timin.gs-by-default.patch => 0012-Use-timin.gs-by-default.patch} (100%)
 rename patches/server/{0012-Recommend-disabling-timings-on-startup.patch => 0013-Recommend-disabling-timings-on-startup.patch} (100%)
 rename patches/server/{0013-Make-timings-calls-final.patch => 0014-Make-timings-calls-final.patch} (100%)
 rename patches/server/{0014-Remove-vanilla-profiler.patch => 0015-Remove-vanilla-profiler.patch} (100%)
 rename patches/server/{0015-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch => 0016-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch} (98%)
 rename patches/server/{0016-Simpler-ShapelessRecipe-comparison-for-vanilla.patch => 0017-Simpler-ShapelessRecipe-comparison-for-vanilla.patch} (100%)
 rename patches/server/{0017-Reduce-projectile-chunk-loading.patch => 0018-Reduce-projectile-chunk-loading.patch} (100%)
 rename patches/server/{0018-Predict-Halloween.patch => 0019-Predict-Halloween.patch} (100%)
 rename patches/server/{0019-Move-random-tick-random.patch => 0020-Move-random-tick-random.patch} (100%)
 rename patches/server/{0020-Optimize-random-calls-in-chunk-ticking.patch => 0021-Optimize-random-calls-in-chunk-ticking.patch} (100%)
 rename patches/server/{0021-Reduce-enderman-teleport-chunk-lookups.patch => 0022-Reduce-enderman-teleport-chunk-lookups.patch} (100%)
 rename patches/server/{0022-Reduce-acquire-POI-for-stuck-entities.patch => 0023-Reduce-acquire-POI-for-stuck-entities.patch} (100%)
 rename patches/server/{0023-Remove-iterators-from-Inventory-contains.patch => 0024-Remove-iterators-from-Inventory-contains.patch} (100%)
 rename patches/server/{0024-Check-targeting-range-before-getting-visibility.patch => 0025-Check-targeting-range-before-getting-visibility.patch} (100%)
 rename patches/server/{0025-Print-stack-trace-for-plugins-not-shutting-down-task.patch => 0026-Print-stack-trace-for-plugins-not-shutting-down-task.patch} (100%)
 rename patches/server/{0026-Improve-fluid-direction-caching.patch => 0027-Improve-fluid-direction-caching.patch} (100%)
 rename patches/server/{0027-Cache-on-climbable-check.patch => 0028-Cache-on-climbable-check.patch} (94%)
 rename patches/server/{0028-Use-array-for-gamerule-storage.patch => 0029-Use-array-for-gamerule-storage.patch} (100%)
 rename patches/server/{0029-Make-EntityCollisionContext-a-live-representation.patch => 0030-Make-EntityCollisionContext-a-live-representation.patch} (100%)
 rename patches/server/{0030-Improve-container-checking-with-a-bitset.patch => 0031-Improve-container-checking-with-a-bitset.patch} (99%)
 rename patches/server/{0031-Better-checking-for-useless-move-packets.patch => 0032-Better-checking-for-useless-move-packets.patch} (100%)
 rename patches/server/{0032-Use-fast-item-merge-raytracing.patch => 0033-Use-fast-item-merge-raytracing.patch} (100%)
 rename patches/server/{0033-Use-aging-cache-for-biome-temperatures.patch => 0034-Use-aging-cache-for-biome-temperatures.patch} (100%)
 rename patches/server/{0034-Inline-level-height.patch => 0035-Inline-level-height.patch} (100%)
 rename patches/server/{0035-Use-ThreadUnsafeRandom-for-mob-spawning.patch => 0036-Use-ThreadUnsafeRandom-for-mob-spawning.patch} (100%)
 rename patches/server/{0036-Remove-streams-and-iterators-from-range-check.patch => 0037-Remove-streams-and-iterators-from-range-check.patch} (100%)
 rename patches/server/{0037-Remove-streams-from-getting-nearby-players.patch => 0038-Remove-streams-from-getting-nearby-players.patch} (97%)
 rename patches/server/{0038-Skip-cloning-loot-parameters.patch => 0039-Skip-cloning-loot-parameters.patch} (100%)
 rename patches/server/{0039-Block-goal-does-not-load-chunks.patch => 0040-Block-goal-does-not-load-chunks.patch} (100%)
 rename patches/server/{0040-Reduce-entity-allocations.patch => 0041-Reduce-entity-allocations.patch} (97%)
 rename patches/server/{0041-Remove-lambda-from-ticking-guard.patch => 0042-Remove-lambda-from-ticking-guard.patch} (100%)
 rename patches/server/{0042-Reduce-entity-fluid-lookups-if-no-fluids.patch => 0043-Reduce-entity-fluid-lookups-if-no-fluids.patch} (99%)
 rename patches/server/{0043-SIMD-support.patch => 0044-SIMD-support.patch} (97%)
 rename patches/server/{0044-Make-book-writing-configurable.patch => 0045-Make-book-writing-configurable.patch} (98%)
 rename patches/server/{0045-Optimize-entity-coordinate-key.patch => 0046-Optimize-entity-coordinate-key.patch} (96%)
 rename patches/server/{0046-Reduce-in-wall-checks.patch => 0047-Reduce-in-wall-checks.patch} (97%)
 rename patches/server/{0047-Make-chat-order-verification-configurable.patch => 0048-Make-chat-order-verification-configurable.patch} (96%)
 rename patches/server/{0048-Make-saving-fireworks-configurable.patch => 0049-Make-saving-fireworks-configurable.patch} (100%)
 rename patches/server/{0049-Don-t-trigger-lootable-refresh-for-non-player-intera.patch => 0050-Don-t-trigger-lootable-refresh-for-non-player-intera.patch} (100%)
 rename patches/server/{0050-Reduce-hopper-item-checks.patch => 0051-Reduce-hopper-item-checks.patch} (100%)
 rename patches/server/{0051-Reduce-villager-item-re-pickup.patch => 0052-Reduce-villager-item-re-pickup.patch} (100%)
 rename patches/server/{0052-Do-not-process-chat-commands-before-player-has-joine.patch => 0053-Do-not-process-chat-commands-before-player-has-joine.patch} (94%)
 rename patches/server/{0053-Do-not-log-invalid-statistics.patch => 0054-Do-not-log-invalid-statistics.patch} (100%)
 rename patches/server/{0054-Do-not-log-empty-message-warnings.patch => 0055-Do-not-log-empty-message-warnings.patch} (96%)
 rename patches/server/{0055-Do-not-log-ignored-advancements.patch => 0056-Do-not-log-ignored-advancements.patch} (100%)
 rename patches/server/{0056-Do-not-log-setBlock-in-far-chunks.patch => 0057-Do-not-log-setBlock-in-far-chunks.patch} (100%)
 rename patches/server/{0057-Do-not-log-unrecognized-recipes.patch => 0058-Do-not-log-unrecognized-recipes.patch} (100%)
 rename patches/server/{0058-Do-not-log-legacy-Material-initialization.patch => 0059-Do-not-log-legacy-Material-initialization.patch} (100%)
 rename patches/server/{0059-Do-not-log-expired-message-warnings.patch => 0060-Do-not-log-expired-message-warnings.patch} (100%)
 rename patches/server/{0060-Do-not-log-out-of-order-message-warnings.patch => 0061-Do-not-log-out-of-order-message-warnings.patch} (96%)
 rename patches/server/{0061-Do-not-log-Not-Secure-marker.patch => 0062-Do-not-log-Not-Secure-marker.patch} (100%)
 rename patches/server/{0062-Do-not-log-run-as-root-warning.patch => 0063-Do-not-log-run-as-root-warning.patch} (100%)
 rename patches/server/{0063-Do-not-log-offline-mode-warning.patch => 0064-Do-not-log-offline-mode-warning.patch} (100%)
 rename patches/server/{0064-Softly-log-invalid-pool-element-errors.patch => 0065-Softly-log-invalid-pool-element-errors.patch} (100%)
 rename patches/server/{0065-Fix-legacy-colors-in-console.patch => 0066-Fix-legacy-colors-in-console.patch} (100%)
 rename patches/server/{0066-Fix-outdated-server-showing-in-ping-before-server-fu.patch => 0067-Fix-outdated-server-showing-in-ping-before-server-fu.patch} (100%)
 rename patches/server/{0067-Make-sand-duping-fix-configurable.patch => 0068-Make-sand-duping-fix-configurable.patch} (97%)
 rename patches/server/{0068-Fix-MC-238526.patch => 0069-Fix-MC-238526.patch} (100%)
 rename patches/server/{0069-Fix-MC-123848.patch => 0070-Fix-MC-123848.patch} (100%)
 rename patches/server/{0070-Fix-cow-rotation-when-shearing-mooshroom.patch => 0071-Fix-cow-rotation-when-shearing-mooshroom.patch} (100%)
 rename patches/server/{0071-Fix-MC-121706.patch => 0072-Fix-MC-121706.patch} (100%)
 rename patches/server/{0072-Fix-MC-110386.patch => 0073-Fix-MC-110386.patch} (100%)
 rename patches/server/{0073-Fix-MC-31819.patch => 0074-Fix-MC-31819.patch} (100%)
 rename patches/server/{0074-Fix-MC-26304.patch => 0075-Fix-MC-26304.patch} (100%)
 rename patches/server/{0075-End-gateway-should-check-if-entity-can-use-portal.patch => 0076-End-gateway-should-check-if-entity-can-use-portal.patch} (100%)
 rename patches/server/{0076-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch => 0077-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch} (100%)
 rename patches/server/{0077-Make-arrow-movement-resetting-despawn-counter-config.patch => 0078-Make-arrow-movement-resetting-despawn-counter-config.patch} (100%)
 rename patches/server/{0078-Make-logging-login-locations-configurable.patch => 0079-Make-logging-login-locations-configurable.patch} (100%)
 rename patches/server/{0079-Reduce-array-allocations.patch => 0080-Reduce-array-allocations.patch} (100%)
 rename patches/server/{0080-Optimize-sun-burn-tick.patch => 0081-Optimize-sun-burn-tick.patch} (97%)
 rename patches/server/{0081-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch => 0082-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch} (100%)
 rename patches/server/{0082-Replace-AI-goal-set-with-optimized-collection.patch => 0083-Replace-AI-goal-set-with-optimized-collection.patch} (100%)
 rename patches/server/{0083-Replace-game-rules-map-with-optimized-collection.patch => 0084-Replace-game-rules-map-with-optimized-collection.patch} (100%)
 rename patches/server/{0084-Replace-AI-attributes-with-optimized-collections.patch => 0085-Replace-AI-attributes-with-optimized-collections.patch} (100%)
 rename patches/server/{0085-Replace-class-map-with-optimized-collection.patch => 0086-Replace-class-map-with-optimized-collection.patch} (100%)
 rename patches/server/{0086-Replace-throttle-tracker-map-with-optimized-collecti.patch => 0087-Replace-throttle-tracker-map-with-optimized-collecti.patch} (100%)
 rename patches/server/{0087-Replace-shape-full-block-cache-with-hashtable.patch => 0088-Replace-shape-full-block-cache-with-hashtable.patch} (100%)
 rename patches/server/{0088-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch => 0089-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch} (100%)
 rename patches/server/{0089-Cache-BlockStatePairKey-hash.patch => 0090-Cache-BlockStatePairKey-hash.patch} (100%)
 rename patches/server/{0090-Cache-CubeVoxelShape-shape-array.patch => 0091-Cache-CubeVoxelShape-shape-array.patch} (100%)
 rename patches/server/{0091-Replace-division-by-multiplication-in-CubePointRange.patch => 0092-Replace-division-by-multiplication-in-CubePointRange.patch} (100%)
 rename patches/server/{0092-Replace-parts-by-size-in-CubePointRange.patch => 0093-Replace-parts-by-size-in-CubePointRange.patch} (100%)
 rename patches/server/{0093-Check-frozen-ticks-before-landing-block.patch => 0094-Check-frozen-ticks-before-landing-block.patch} (94%)
 rename patches/server/{0094-Faster-chunk-serialization.patch => 0095-Faster-chunk-serialization.patch} (100%)
 rename patches/server/{0095-Update-boss-bar-within-tick.patch => 0096-Update-boss-bar-within-tick.patch} (100%)
 rename patches/server/{0096-Cache-ominous-banner-item.patch => 0097-Cache-ominous-banner-item.patch} (100%)
 rename patches/server/{0097-Optimize-world-generation-chunk-and-block-access.patch => 0098-Optimize-world-generation-chunk-and-block-access.patch} (100%)
 rename patches/server/{0098-Cache-world-generator-sea-level.patch => 0099-Cache-world-generator-sea-level.patch} (100%)
 rename patches/server/{0099-Skip-secondary-POI-sensor-if-absent.patch => 0100-Skip-secondary-POI-sensor-if-absent.patch} (100%)
 rename patches/server/{0100-Optimize-villager-data-storage.patch => 0101-Optimize-villager-data-storage.patch} (100%)
 rename patches/server/{0101-Skip-entity-move-if-movement-is-zero.patch => 0102-Skip-entity-move-if-movement-is-zero.patch} (96%)
 rename patches/server/{0102-Store-mob-counts-in-an-array.patch => 0103-Store-mob-counts-in-an-array.patch} (100%)
 rename patches/server/{0103-Use-linked-map-for-entity-trackers.patch => 0104-Use-linked-map-for-entity-trackers.patch} (100%)
 rename patches/server/{0104-Optimize-noise-generation.patch => 0105-Optimize-noise-generation.patch} (100%)
 rename patches/server/{0105-Optimize-sheep-offspring-color.patch => 0106-Optimize-sheep-offspring-color.patch} (100%)
 rename patches/server/{0106-Ignore-durability-change-equipment-updates.patch => 0107-Ignore-durability-change-equipment-updates.patch} (100%)
 rename patches/server/{0107-Hide-flames-on-entities-with-fire-resistance.patch => 0108-Hide-flames-on-entities-with-fire-resistance.patch} (96%)
 rename patches/server/{0108-Skip-cloning-advancement-criteria.patch => 0109-Skip-cloning-advancement-criteria.patch} (100%)
 rename patches/server/{0109-Reduce-block-destruction-packet-allocations.patch => 0110-Reduce-block-destruction-packet-allocations.patch} (100%)
 rename patches/server/{0110-Send-set-head-rotation-packets-only-for-living-entit.patch => 0111-Send-set-head-rotation-packets-only-for-living-entit.patch} (100%)
 rename patches/server/{0111-Player-canSee-by-entity-UUID.patch => 0112-Player-canSee-by-entity-UUID.patch} (100%)
 rename patches/server/{0112-Spread-out-sending-all-player-info.patch => 0113-Spread-out-sending-all-player-info.patch} (100%)
 rename patches/server/{0113-Optimize-player-list-for-sending-player-info.patch => 0114-Optimize-player-list-for-sending-player-info.patch} (100%)
 rename patches/server/{0114-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch => 0115-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch} (100%)
 rename patches/server/{0115-Send-multiple-keep-alive-packets.patch => 0116-Send-multiple-keep-alive-packets.patch} (98%)
 rename patches/server/{0116-Make-slow-login-timeout-configurable.patch => 0117-Make-slow-login-timeout-configurable.patch} (96%)
 rename patches/server/{0117-Make-max-interaction-distance-configurable.patch => 0118-Make-max-interaction-distance-configurable.patch} (98%)
 rename patches/server/{0118-Load-portal-destination-chunk-before-entity-teleport.patch => 0119-Load-portal-destination-chunk-before-entity-teleport.patch} (97%)
 rename patches/server/{0119-Don-t-load-chunks-to-spawn-phantoms.patch => 0120-Don-t-load-chunks-to-spawn-phantoms.patch} (100%)
 rename patches/server/{0120-Don-t-load-chunks-to-activate-climbing-entities.patch => 0121-Don-t-load-chunks-to-activate-climbing-entities.patch} (96%)
 rename patches/server/{0121-Broadcast-crit-animations-as-the-entity-being-critte.patch => 0122-Broadcast-crit-animations-as-the-entity-being-critte.patch} (100%)
 rename patches/server/{0122-Ignore-null-legacy-structure-data.patch => 0123-Ignore-null-legacy-structure-data.patch} (100%)
 rename patches/server/{0123-Don-t-double-save-stored-user-lists.patch => 0124-Don-t-double-save-stored-user-lists.patch} (100%)
 rename patches/server/{0124-Skip-unnecessary-mob-spawning-computations.patch => 0125-Skip-unnecessary-mob-spawning-computations.patch} (100%)
 rename patches/server/{0125-Prevent-entities-random-strolling-into-non-ticking-c.patch => 0126-Prevent-entities-random-strolling-into-non-ticking-c.patch} (100%)
 rename patches/server/{0126-Do-not-place-player-in-world-if-kicked-before-being-.patch => 0127-Do-not-place-player-in-world-if-kicked-before-being-.patch} (94%)
 rename patches/server/{0127-CraftBukkit-UUID-to-world-map.patch => 0128-CraftBukkit-UUID-to-world-map.patch} (100%)
 rename patches/server/{0128-Global-EULA-file.patch => 0129-Global-EULA-file.patch} (100%)
 rename patches/server/{0129-Specific-interval-TPS-API.patch => 0130-Specific-interval-TPS-API.patch} (100%)
 rename patches/server/{0130-5-second-TPS-average.patch => 0131-5-second-TPS-average.patch} (100%)
 rename patches/server/{0131-Measure-last-tick-time.patch => 0132-Measure-last-tick-time.patch} (100%)
 rename patches/server/{0132-Last-tick-time-API.patch => 0133-Last-tick-time-API.patch} (100%)
 rename patches/server/{0133-Show-last-tick-time-in-tps-command.patch => 0134-Show-last-tick-time-in-tps-command.patch} (100%)
 rename patches/server/{0134-Increase-time-statistics-in-intervals.patch => 0135-Increase-time-statistics-in-intervals.patch} (100%)
 rename patches/server/{0135-For-collision-check-has-physics-before-same-vehicle.patch => 0136-For-collision-check-has-physics-before-same-vehicle.patch} (94%)
 rename patches/server/{0136-Skip-negligible-planar-movement-multiplication.patch => 0137-Skip-negligible-planar-movement-multiplication.patch} (94%)
 rename patches/server/{0137-Optimize-identical-item-checks.patch => 0138-Optimize-identical-item-checks.patch} (100%)
 rename patches/server/{0138-Reduce-RandomSource-instances.patch => 0139-Reduce-RandomSource-instances.patch} (99%)
 rename patches/server/{0139-Server-thread-priority-environment-variable.patch => 0140-Server-thread-priority-environment-variable.patch} (100%)
 rename patches/server/{0140-Thread-safety-annotations.patch => 0141-Thread-safety-annotations.patch} (100%)
 rename patches/server/{0141-CPU-cores-estimation.patch => 0142-CPU-cores-estimation.patch} (100%)
 rename patches/server/{0142-Mutex-utility.patch => 0143-Mutex-utility.patch} (96%)
 rename patches/server/{0143-Thread-aware-lock-utility.patch => 0144-Thread-aware-lock-utility.patch} (100%)
 rename patches/server/{0144-Unterminable-executor-utility.patch => 0145-Unterminable-executor-utility.patch} (100%)
 rename patches/server/{0145-FIFO-concurrent-queue-utility.patch => 0146-FIFO-concurrent-queue-utility.patch} (100%)
 rename patches/server/{0146-Base-thread-pool.patch => 0147-Base-thread-pool.patch} (99%)
 create mode 100644 patches/server/0148-Watch-for-blocking-base-threads.patch
 rename patches/server/{0147-Non-blocking-PooledObjects.patch => 0149-Non-blocking-PooledObjects.patch} (100%)
 rename patches/server/{0148-Yielding-memoized-Supplier.patch => 0150-Yielding-memoized-Supplier.patch} (100%)
 rename patches/server/{0149-Run-async-executor-tasks-on-base-thread-pool.patch => 0151-Run-async-executor-tasks-on-base-thread-pool.patch} (100%)
 rename patches/server/{0150-Run-background-executor-tasks-on-base-thread-pool.patch => 0152-Run-background-executor-tasks-on-base-thread-pool.patch} (100%)
 rename patches/server/{0151-Run-world-upgrade-tasks-on-base-thread-pool.patch => 0153-Run-world-upgrade-tasks-on-base-thread-pool.patch} (100%)
 rename patches/server/{0152-Run-tab-completion-tasks-on-base-thread-pool.patch => 0154-Run-tab-completion-tasks-on-base-thread-pool.patch} (100%)
 rename patches/server/{0153-Run-text-filter-tasks-on-base-thread-pool.patch => 0155-Run-text-filter-tasks-on-base-thread-pool.patch} (100%)
 rename patches/server/{0154-Run-cleaner-tasks-on-base-thread-pool.patch => 0156-Run-cleaner-tasks-on-base-thread-pool.patch} (100%)
 rename patches/server/{0155-Run-chunk-cache-tasks-on-base-thread-pool.patch => 0157-Run-chunk-cache-tasks-on-base-thread-pool.patch} (100%)
 rename patches/server/{0156-Run-TickThread-chunk-tasks-on-base-thread-pool.patch => 0158-Run-TickThread-chunk-tasks-on-base-thread-pool.patch} (100%)
 rename patches/server/{0157-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch => 0159-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch} (100%)
 rename patches/server/{0158-Run-chunk-worker-tasks-on-base-thread-pool.patch => 0160-Run-chunk-worker-tasks-on-base-thread-pool.patch} (100%)
 rename patches/server/{0159-Split-tick-steps.patch => 0161-Split-tick-steps.patch} (100%)
 rename patches/server/{0160-Multithreaded-ticking.patch => 0162-Multithreaded-ticking.patch} (100%)

diff --git a/patches/server/0009-Include-time-in-startup-logs.patch b/patches/server/0009-Include-time-in-startup-logs.patch
new file mode 100644
index 0000000..9a5f25f
--- /dev/null
+++ b/patches/server/0009-Include-time-in-startup-logs.patch
@@ -0,0 +1,64 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Martijn Muijsers <martijnmuijsers@live.nl>
+Date: Sat, 4 Feb 2023 10:58:12 +0100
+Subject: [PATCH] Include time in startup logs
+
+License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
+Gale - https://galemc.org
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
+index 190e17eb28d166aedee06e9578561ba402d1b6d2..fab5d1c1531fa89113bef6d17df8437b0aec4582 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -2,6 +2,7 @@ package org.bukkit.craftbukkit;
+ 
+ import java.io.File;
+ import java.io.IOException;
++import java.text.DateFormat;
+ import java.text.SimpleDateFormat;
+ import java.util.Arrays;
+ import java.util.Calendar;
+@@ -26,6 +27,26 @@ public class Main {
+     }
+     // Paper end
+ 
++    // Gale start - include time in startup logs
++    private static final DateFormat startupDateFormat = new SimpleDateFormat("hh:mm:ss");
++
++    private static void printlnStartupToSystemOut(String type, String line) {
++        System.out.println("[" + startupDateFormat.format(new Date()) + " " + type + "]: " + line);
++    }
++
++    public static void printlnStartupInfoToSystemOut(String line) {
++        printlnStartupToSystemOut("INFO", line);
++    }
++
++    public static void printlnStartupWarningToSystemOut(String line) {
++        printlnStartupToSystemOut("WARN", line);
++    }
++
++    public static void printlnStartupErrorToSystemOut(String line) {
++        printlnStartupToSystemOut("ERROR", line);
++    }
++    // Gale end - include time in startup logs
++
+     public static void main(String[] args) {
+         // Paper start
+         final String warnWhenLegacyFormattingDetected = String.join(".", "net", "kyori", "adventure", "text", "warnWhenLegacyFormattingDetected");
+@@ -292,13 +313,13 @@ public class Main {
+                     String javaInfo = "Java " + runtimeMX.getSpecVersion() + " (" + runtimeMX.getVmName() + " " + runtimeMX.getVmVersion() + ")";
+                     String osInfo = "Host: " + osMX.getName() + " " + osMX.getVersion() + " (" + osMX.getArch() + ")";
+ 
+-                    System.out.println("System Info: " + javaInfo + " " + osInfo);
++                    printlnStartupInfoToSystemOut("System Info: " + javaInfo + " " + osInfo); // Gale - include time in startup logs
+                 } else {
+-                    System.out.println("Unable to read system info");
++                    printlnStartupInfoToSystemOut("Unable to read system info"); // Gale - include time in startup logs
+                 }
+                 // Paper end
+                 System.setProperty( "library.jansi.version", "Paper" ); // Paper - set meaningless jansi version to prevent git builds from crashing on Windows
+-                System.out.println("Loading libraries, please wait...");
++                printlnStartupInfoToSystemOut("Loading libraries, please wait..."); // Gale - include time in startup logs
+                 net.minecraft.server.Main.main(options);
+             } catch (Throwable t) {
+                 t.printStackTrace();
diff --git a/patches/server/0009-Include-server.properties-in-timings.patch b/patches/server/0010-Include-server.properties-in-timings.patch
similarity index 100%
rename from patches/server/0009-Include-server.properties-in-timings.patch
rename to patches/server/0010-Include-server.properties-in-timings.patch
diff --git a/patches/server/0010-Include-hardware-specs-in-timings.patch b/patches/server/0011-Include-hardware-specs-in-timings.patch
similarity index 100%
rename from patches/server/0010-Include-hardware-specs-in-timings.patch
rename to patches/server/0011-Include-hardware-specs-in-timings.patch
diff --git a/patches/server/0011-Use-timin.gs-by-default.patch b/patches/server/0012-Use-timin.gs-by-default.patch
similarity index 100%
rename from patches/server/0011-Use-timin.gs-by-default.patch
rename to patches/server/0012-Use-timin.gs-by-default.patch
diff --git a/patches/server/0012-Recommend-disabling-timings-on-startup.patch b/patches/server/0013-Recommend-disabling-timings-on-startup.patch
similarity index 100%
rename from patches/server/0012-Recommend-disabling-timings-on-startup.patch
rename to patches/server/0013-Recommend-disabling-timings-on-startup.patch
diff --git a/patches/server/0013-Make-timings-calls-final.patch b/patches/server/0014-Make-timings-calls-final.patch
similarity index 100%
rename from patches/server/0013-Make-timings-calls-final.patch
rename to patches/server/0014-Make-timings-calls-final.patch
diff --git a/patches/server/0014-Remove-vanilla-profiler.patch b/patches/server/0015-Remove-vanilla-profiler.patch
similarity index 100%
rename from patches/server/0014-Remove-vanilla-profiler.patch
rename to patches/server/0015-Remove-vanilla-profiler.patch
diff --git a/patches/server/0015-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0016-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
similarity index 98%
rename from patches/server/0015-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
rename to patches/server/0016-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
index a80f985..3e61c55 100644
--- a/patches/server/0015-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/server/0016-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
@@ -40,7 +40,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/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3a116b37a89306ea8f2b7eec867d0e3c3523f74c..6d7f51274537f5041c9f98923bb72b9fc9ddd295 100644
+index 763b3a46e922c3db26507d2975f4b3e105f30838..365a740881e60d86c2ede8b1f498e9222a827f9a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3629,7 +3629,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0016-Simpler-ShapelessRecipe-comparison-for-vanilla.patch b/patches/server/0017-Simpler-ShapelessRecipe-comparison-for-vanilla.patch
similarity index 100%
rename from patches/server/0016-Simpler-ShapelessRecipe-comparison-for-vanilla.patch
rename to patches/server/0017-Simpler-ShapelessRecipe-comparison-for-vanilla.patch
diff --git a/patches/server/0017-Reduce-projectile-chunk-loading.patch b/patches/server/0018-Reduce-projectile-chunk-loading.patch
similarity index 100%
rename from patches/server/0017-Reduce-projectile-chunk-loading.patch
rename to patches/server/0018-Reduce-projectile-chunk-loading.patch
diff --git a/patches/server/0018-Predict-Halloween.patch b/patches/server/0019-Predict-Halloween.patch
similarity index 100%
rename from patches/server/0018-Predict-Halloween.patch
rename to patches/server/0019-Predict-Halloween.patch
diff --git a/patches/server/0019-Move-random-tick-random.patch b/patches/server/0020-Move-random-tick-random.patch
similarity index 100%
rename from patches/server/0019-Move-random-tick-random.patch
rename to patches/server/0020-Move-random-tick-random.patch
diff --git a/patches/server/0020-Optimize-random-calls-in-chunk-ticking.patch b/patches/server/0021-Optimize-random-calls-in-chunk-ticking.patch
similarity index 100%
rename from patches/server/0020-Optimize-random-calls-in-chunk-ticking.patch
rename to patches/server/0021-Optimize-random-calls-in-chunk-ticking.patch
diff --git a/patches/server/0021-Reduce-enderman-teleport-chunk-lookups.patch b/patches/server/0022-Reduce-enderman-teleport-chunk-lookups.patch
similarity index 100%
rename from patches/server/0021-Reduce-enderman-teleport-chunk-lookups.patch
rename to patches/server/0022-Reduce-enderman-teleport-chunk-lookups.patch
diff --git a/patches/server/0022-Reduce-acquire-POI-for-stuck-entities.patch b/patches/server/0023-Reduce-acquire-POI-for-stuck-entities.patch
similarity index 100%
rename from patches/server/0022-Reduce-acquire-POI-for-stuck-entities.patch
rename to patches/server/0023-Reduce-acquire-POI-for-stuck-entities.patch
diff --git a/patches/server/0023-Remove-iterators-from-Inventory-contains.patch b/patches/server/0024-Remove-iterators-from-Inventory-contains.patch
similarity index 100%
rename from patches/server/0023-Remove-iterators-from-Inventory-contains.patch
rename to patches/server/0024-Remove-iterators-from-Inventory-contains.patch
diff --git a/patches/server/0024-Check-targeting-range-before-getting-visibility.patch b/patches/server/0025-Check-targeting-range-before-getting-visibility.patch
similarity index 100%
rename from patches/server/0024-Check-targeting-range-before-getting-visibility.patch
rename to patches/server/0025-Check-targeting-range-before-getting-visibility.patch
diff --git a/patches/server/0025-Print-stack-trace-for-plugins-not-shutting-down-task.patch b/patches/server/0026-Print-stack-trace-for-plugins-not-shutting-down-task.patch
similarity index 100%
rename from patches/server/0025-Print-stack-trace-for-plugins-not-shutting-down-task.patch
rename to patches/server/0026-Print-stack-trace-for-plugins-not-shutting-down-task.patch
diff --git a/patches/server/0026-Improve-fluid-direction-caching.patch b/patches/server/0027-Improve-fluid-direction-caching.patch
similarity index 100%
rename from patches/server/0026-Improve-fluid-direction-caching.patch
rename to patches/server/0027-Improve-fluid-direction-caching.patch
diff --git a/patches/server/0027-Cache-on-climbable-check.patch b/patches/server/0028-Cache-on-climbable-check.patch
similarity index 94%
rename from patches/server/0027-Cache-on-climbable-check.patch
rename to patches/server/0028-Cache-on-climbable-check.patch
index d9fef4a..3b6bb70 100644
--- a/patches/server/0027-Cache-on-climbable-check.patch
+++ b/patches/server/0028-Cache-on-climbable-check.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/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 6d7f51274537f5041c9f98923bb72b9fc9ddd295..7f4f4f291cbe0281bd4da94bc1f7a16215622e7f 100644
+index 365a740881e60d86c2ede8b1f498e9222a827f9a..e68eef2c5c8d3aea186beb5997122b8371fa11ae 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -143,7 +143,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -64,7 +64,7 @@ index 6d7f51274537f5041c9f98923bb72b9fc9ddd295..7f4f4f291cbe0281bd4da94bc1f7a162
          if (this.isSpectator()) {
              return false;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 1b42c98956342832c37f0aa266f85271daa4ba5b..ad1187d2a513dbfd624d15b0663e07c70dc72f3a 100644
+index e881584d38dc354204479863f004e974a0ac6c07..2bff2b6cff78f1ad4cbc6abbc1a37464f543ccb7 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -291,7 +291,7 @@ public class ActivationRange
diff --git a/patches/server/0028-Use-array-for-gamerule-storage.patch b/patches/server/0029-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0028-Use-array-for-gamerule-storage.patch
rename to patches/server/0029-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0029-Make-EntityCollisionContext-a-live-representation.patch b/patches/server/0030-Make-EntityCollisionContext-a-live-representation.patch
similarity index 100%
rename from patches/server/0029-Make-EntityCollisionContext-a-live-representation.patch
rename to patches/server/0030-Make-EntityCollisionContext-a-live-representation.patch
diff --git a/patches/server/0030-Improve-container-checking-with-a-bitset.patch b/patches/server/0031-Improve-container-checking-with-a-bitset.patch
similarity index 99%
rename from patches/server/0030-Improve-container-checking-with-a-bitset.patch
rename to patches/server/0031-Improve-container-checking-with-a-bitset.patch
index a660968..0b45245 100644
--- a/patches/server/0030-Improve-container-checking-with-a-bitset.patch
+++ b/patches/server/0031-Improve-container-checking-with-a-bitset.patch
@@ -265,7 +265,7 @@ index 540bc9500c35c0db719b00aa26f6fb3a1b08ed9f..f5bed0f18b2a3dbe7d52c1b83717298f
      int LARGE_MAX_STACK_SIZE = 64;
  
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-index b8fb7b5a347298ada16bc8b818edf1863e3f6040..8de3aa9dae051ef12dc59e761ea8fcaf497bb01e 100644
+index cc74eeb45913fab03e85969957215d2811252a83..33801e0725f023d077dbd91a593453d8af367cc2 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
 @@ -27,7 +27,10 @@ import org.bukkit.inventory.InventoryHolder;
diff --git a/patches/server/0031-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/0031-Better-checking-for-useless-move-packets.patch
rename to patches/server/0032-Better-checking-for-useless-move-packets.patch
diff --git a/patches/server/0032-Use-fast-item-merge-raytracing.patch b/patches/server/0033-Use-fast-item-merge-raytracing.patch
similarity index 100%
rename from patches/server/0032-Use-fast-item-merge-raytracing.patch
rename to patches/server/0033-Use-fast-item-merge-raytracing.patch
diff --git a/patches/server/0033-Use-aging-cache-for-biome-temperatures.patch b/patches/server/0034-Use-aging-cache-for-biome-temperatures.patch
similarity index 100%
rename from patches/server/0033-Use-aging-cache-for-biome-temperatures.patch
rename to patches/server/0034-Use-aging-cache-for-biome-temperatures.patch
diff --git a/patches/server/0034-Inline-level-height.patch b/patches/server/0035-Inline-level-height.patch
similarity index 100%
rename from patches/server/0034-Inline-level-height.patch
rename to patches/server/0035-Inline-level-height.patch
diff --git a/patches/server/0035-Use-ThreadUnsafeRandom-for-mob-spawning.patch b/patches/server/0036-Use-ThreadUnsafeRandom-for-mob-spawning.patch
similarity index 100%
rename from patches/server/0035-Use-ThreadUnsafeRandom-for-mob-spawning.patch
rename to patches/server/0036-Use-ThreadUnsafeRandom-for-mob-spawning.patch
diff --git a/patches/server/0036-Remove-streams-and-iterators-from-range-check.patch b/patches/server/0037-Remove-streams-and-iterators-from-range-check.patch
similarity index 100%
rename from patches/server/0036-Remove-streams-and-iterators-from-range-check.patch
rename to patches/server/0037-Remove-streams-and-iterators-from-range-check.patch
diff --git a/patches/server/0037-Remove-streams-from-getting-nearby-players.patch b/patches/server/0038-Remove-streams-from-getting-nearby-players.patch
similarity index 97%
rename from patches/server/0037-Remove-streams-from-getting-nearby-players.patch
rename to patches/server/0038-Remove-streams-from-getting-nearby-players.patch
index 3255ba5..99c13e5 100644
--- a/patches/server/0037-Remove-streams-from-getting-nearby-players.patch
+++ b/patches/server/0038-Remove-streams-from-getting-nearby-players.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/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index da40e419a245a43dec75a0cc3028cb0a42087c3f..f5a6da990507e695d9a3c198a6e72dd45906c3e3 100644
+index aaa5af793ae0c177bcde75880445a3eb5970ce23..35affcc64e84c2daca72735271268eebde2eb25f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -488,17 +488,37 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0038-Skip-cloning-loot-parameters.patch b/patches/server/0039-Skip-cloning-loot-parameters.patch
similarity index 100%
rename from patches/server/0038-Skip-cloning-loot-parameters.patch
rename to patches/server/0039-Skip-cloning-loot-parameters.patch
diff --git a/patches/server/0039-Block-goal-does-not-load-chunks.patch b/patches/server/0040-Block-goal-does-not-load-chunks.patch
similarity index 100%
rename from patches/server/0039-Block-goal-does-not-load-chunks.patch
rename to patches/server/0040-Block-goal-does-not-load-chunks.patch
diff --git a/patches/server/0040-Reduce-entity-allocations.patch b/patches/server/0041-Reduce-entity-allocations.patch
similarity index 97%
rename from patches/server/0040-Reduce-entity-allocations.patch
rename to patches/server/0041-Reduce-entity-allocations.patch
index 0f8a777..8a51273 100644
--- a/patches/server/0040-Reduce-entity-allocations.patch
+++ b/patches/server/0041-Reduce-entity-allocations.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/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f5a6da990507e695d9a3c198a6e72dd45906c3e3..58c3ca0a917803e68701b6ac2ec193133cfe7fe0 100644
+index 35affcc64e84c2daca72735271268eebde2eb25f..22ac029452a24199a90576c9456d4ba5eaaeb594 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -414,6 +414,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0041-Remove-lambda-from-ticking-guard.patch b/patches/server/0042-Remove-lambda-from-ticking-guard.patch
similarity index 100%
rename from patches/server/0041-Remove-lambda-from-ticking-guard.patch
rename to patches/server/0042-Remove-lambda-from-ticking-guard.patch
diff --git a/patches/server/0042-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0043-Reduce-entity-fluid-lookups-if-no-fluids.patch
similarity index 99%
rename from patches/server/0042-Reduce-entity-fluid-lookups-if-no-fluids.patch
rename to patches/server/0043-Reduce-entity-fluid-lookups-if-no-fluids.patch
index 85a0082..de3d5d6 100644
--- a/patches/server/0042-Reduce-entity-fluid-lookups-if-no-fluids.patch
+++ b/patches/server/0043-Reduce-entity-fluid-lookups-if-no-fluids.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/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 58c3ca0a917803e68701b6ac2ec193133cfe7fe0..9f6dfe81d1c1d1308505eb0d495d63e8b5be246a 100644
+index 22ac029452a24199a90576c9456d4ba5eaaeb594..72a0b1b084aafb8bb07eae4c9587a786766e24f2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4099,16 +4099,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0043-SIMD-support.patch b/patches/server/0044-SIMD-support.patch
similarity index 97%
rename from patches/server/0043-SIMD-support.patch
rename to patches/server/0044-SIMD-support.patch
index 13a183d..4263800 100644
--- a/patches/server/0043-SIMD-support.patch
+++ b/patches/server/0044-SIMD-support.patch
@@ -13,7 +13,7 @@ As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index ebe3f85542004002713dd327e8a423f2570695ed..f3287cea49ee7352a1065dc65927ab9922d0a9c4 100644
+index 01780a73ee9cc602951bdf568c17673c4c639f79..4b279948e82a6dfd2f471ba698e361dcfe4499de 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -62,6 +62,7 @@ tasks.withType<JavaCompile> {
diff --git a/patches/server/0044-Make-book-writing-configurable.patch b/patches/server/0045-Make-book-writing-configurable.patch
similarity index 98%
rename from patches/server/0044-Make-book-writing-configurable.patch
rename to patches/server/0045-Make-book-writing-configurable.patch
index 9e4cef2..cd30c6d 100644
--- a/patches/server/0044-Make-book-writing-configurable.patch
+++ b/patches/server/0045-Make-book-writing-configurable.patch
@@ -22,7 +22,7 @@ you to easily disable books, should you want to preemptively remove this
 functionality before additional exploits are found.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1192b751c8d00754d40781e714bc3f6330767f75..d31f52ace6dd6a80adb639e1e50f4b547b23103d 100644
+index 547cc76d2086a658cbf667dcd6e47227a0a26b7b..92fc01fb38130fc9c77e47e4b1db99f892d5459f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -182,6 +182,8 @@ import net.minecraft.world.phys.Vec3;
diff --git a/patches/server/0045-Optimize-entity-coordinate-key.patch b/patches/server/0046-Optimize-entity-coordinate-key.patch
similarity index 96%
rename from patches/server/0045-Optimize-entity-coordinate-key.patch
rename to patches/server/0046-Optimize-entity-coordinate-key.patch
index fb42d90..9ad903a 100644
--- a/patches/server/0045-Optimize-entity-coordinate-key.patch
+++ b/patches/server/0046-Optimize-entity-coordinate-key.patch
@@ -35,7 +35,7 @@ index d1a59c2af0557a816c094983ec60097fb4de060c..3fad7e58a1461d897526d63efd27075f
  
      public static long getCoordinateKey(final ChunkPos pair) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9f6dfe81d1c1d1308505eb0d495d63e8b5be246a..ca5b6a05ea3a3005d4a46f8581f498f6aadaee74 100644
+index 72a0b1b084aafb8bb07eae4c9587a786766e24f2..cd705a59d63eaaf090c63f5c3d088db3cb1afa16 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -291,7 +291,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0046-Reduce-in-wall-checks.patch b/patches/server/0047-Reduce-in-wall-checks.patch
similarity index 97%
rename from patches/server/0046-Reduce-in-wall-checks.patch
rename to patches/server/0047-Reduce-in-wall-checks.patch
index caf0d7f..3f45aa3 100644
--- a/patches/server/0046-Reduce-in-wall-checks.patch
+++ b/patches/server/0047-Reduce-in-wall-checks.patch
@@ -28,7 +28,7 @@ but is so much cheaper than the suffocation check that it's worth
 keeping it.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7f4f4f291cbe0281bd4da94bc1f7a16215622e7f..20f70e0bc085a941a7e5de3ceff968870f23fb5f 100644
+index e68eef2c5c8d3aea186beb5997122b8371fa11ae..6b1fb422d68f3b83fef66a8af997b2140f1d0897 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -400,7 +400,10 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0047-Make-chat-order-verification-configurable.patch b/patches/server/0048-Make-chat-order-verification-configurable.patch
similarity index 96%
rename from patches/server/0047-Make-chat-order-verification-configurable.patch
rename to patches/server/0048-Make-chat-order-verification-configurable.patch
index 59685c2..e3d594d 100644
--- a/patches/server/0047-Make-chat-order-verification-configurable.patch
+++ b/patches/server/0048-Make-chat-order-verification-configurable.patch
@@ -13,7 +13,7 @@ As part of: Pufferfish (https://github.com/pufferfish-gg/Pufferfish)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d31f52ace6dd6a80adb639e1e50f4b547b23103d..9e8c1bb48b2453296cd235cc0c127032ebf73053 100644
+index 92fc01fb38130fc9c77e47e4b1db99f892d5459f..dce5cff1d85ca2dd642219ca2a1adfc2adbae4d6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2357,6 +2357,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0048-Make-saving-fireworks-configurable.patch b/patches/server/0049-Make-saving-fireworks-configurable.patch
similarity index 100%
rename from patches/server/0048-Make-saving-fireworks-configurable.patch
rename to patches/server/0049-Make-saving-fireworks-configurable.patch
diff --git a/patches/server/0049-Don-t-trigger-lootable-refresh-for-non-player-intera.patch b/patches/server/0050-Don-t-trigger-lootable-refresh-for-non-player-intera.patch
similarity index 100%
rename from patches/server/0049-Don-t-trigger-lootable-refresh-for-non-player-intera.patch
rename to patches/server/0050-Don-t-trigger-lootable-refresh-for-non-player-intera.patch
diff --git a/patches/server/0050-Reduce-hopper-item-checks.patch b/patches/server/0051-Reduce-hopper-item-checks.patch
similarity index 100%
rename from patches/server/0050-Reduce-hopper-item-checks.patch
rename to patches/server/0051-Reduce-hopper-item-checks.patch
diff --git a/patches/server/0051-Reduce-villager-item-re-pickup.patch b/patches/server/0052-Reduce-villager-item-re-pickup.patch
similarity index 100%
rename from patches/server/0051-Reduce-villager-item-re-pickup.patch
rename to patches/server/0052-Reduce-villager-item-re-pickup.patch
diff --git a/patches/server/0052-Do-not-process-chat-commands-before-player-has-joine.patch b/patches/server/0053-Do-not-process-chat-commands-before-player-has-joine.patch
similarity index 94%
rename from patches/server/0052-Do-not-process-chat-commands-before-player-has-joine.patch
rename to patches/server/0053-Do-not-process-chat-commands-before-player-has-joine.patch
index 71834a6..3276530 100644
--- a/patches/server/0052-Do-not-process-chat-commands-before-player-has-joine.patch
+++ b/patches/server/0053-Do-not-process-chat-commands-before-player-has-joine.patch
@@ -25,7 +25,7 @@ index a07da939bb6b2dd0bd75cc74dd79493695035259..9d74ef6973f6a9e12861256aa7032f8d
      // CraftBukkit end
      public boolean isRealPlayer; // Paper
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9e8c1bb48b2453296cd235cc0c127032ebf73053..63b54d47203d796b7dfeac2e6e04ce49b5a72ae5 100644
+index dce5cff1d85ca2dd642219ca2a1adfc2adbae4d6..16a8e3819258e3e42ade5f237e473765b3f8b3c7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2333,6 +2333,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -40,7 +40,7 @@ index 9e8c1bb48b2453296cd235cc0c127032ebf73053..63b54d47203d796b7dfeac2e6e04ce49
              Optional<LastSeenMessages> optional = this.unpackAndApplyLastSeen(acknowledgment);
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f381bf9064be548a4a603e0042886d8a5e70ba5b..603d87fedf731498ebf516fdda3c785bd01bf830 100644
+index 4b754f6eae683248d7fe11d6d6cb168d5dd696a2..601b7cb73af55bdf8fd51c5f73e96a9656576cc2 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -322,6 +322,8 @@ public abstract class PlayerList {
diff --git a/patches/server/0053-Do-not-log-invalid-statistics.patch b/patches/server/0054-Do-not-log-invalid-statistics.patch
similarity index 100%
rename from patches/server/0053-Do-not-log-invalid-statistics.patch
rename to patches/server/0054-Do-not-log-invalid-statistics.patch
diff --git a/patches/server/0054-Do-not-log-empty-message-warnings.patch b/patches/server/0055-Do-not-log-empty-message-warnings.patch
similarity index 96%
rename from patches/server/0054-Do-not-log-empty-message-warnings.patch
rename to patches/server/0055-Do-not-log-empty-message-warnings.patch
index 8ec1642..5bca05c 100644
--- a/patches/server/0054-Do-not-log-empty-message-warnings.patch
+++ b/patches/server/0055-Do-not-log-empty-message-warnings.patch
@@ -7,7 +7,7 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 63b54d47203d796b7dfeac2e6e04ce49b5a72ae5..37bf4f356a23224fb5da949e8311c895c3529cf8 100644
+index 16a8e3819258e3e42ade5f237e473765b3f8b3c7..d2a09822104c954f06f64ad2a63012e433088169 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -183,6 +183,7 @@ import net.minecraft.world.phys.shapes.BooleanOp;
diff --git a/patches/server/0055-Do-not-log-ignored-advancements.patch b/patches/server/0056-Do-not-log-ignored-advancements.patch
similarity index 100%
rename from patches/server/0055-Do-not-log-ignored-advancements.patch
rename to patches/server/0056-Do-not-log-ignored-advancements.patch
diff --git a/patches/server/0056-Do-not-log-setBlock-in-far-chunks.patch b/patches/server/0057-Do-not-log-setBlock-in-far-chunks.patch
similarity index 100%
rename from patches/server/0056-Do-not-log-setBlock-in-far-chunks.patch
rename to patches/server/0057-Do-not-log-setBlock-in-far-chunks.patch
diff --git a/patches/server/0057-Do-not-log-unrecognized-recipes.patch b/patches/server/0058-Do-not-log-unrecognized-recipes.patch
similarity index 100%
rename from patches/server/0057-Do-not-log-unrecognized-recipes.patch
rename to patches/server/0058-Do-not-log-unrecognized-recipes.patch
diff --git a/patches/server/0058-Do-not-log-legacy-Material-initialization.patch b/patches/server/0059-Do-not-log-legacy-Material-initialization.patch
similarity index 100%
rename from patches/server/0058-Do-not-log-legacy-Material-initialization.patch
rename to patches/server/0059-Do-not-log-legacy-Material-initialization.patch
diff --git a/patches/server/0059-Do-not-log-expired-message-warnings.patch b/patches/server/0060-Do-not-log-expired-message-warnings.patch
similarity index 100%
rename from patches/server/0059-Do-not-log-expired-message-warnings.patch
rename to patches/server/0060-Do-not-log-expired-message-warnings.patch
diff --git a/patches/server/0060-Do-not-log-out-of-order-message-warnings.patch b/patches/server/0061-Do-not-log-out-of-order-message-warnings.patch
similarity index 96%
rename from patches/server/0060-Do-not-log-out-of-order-message-warnings.patch
rename to patches/server/0061-Do-not-log-out-of-order-message-warnings.patch
index 37c358f..216cdf6 100644
--- a/patches/server/0060-Do-not-log-out-of-order-message-warnings.patch
+++ b/patches/server/0061-Do-not-log-out-of-order-message-warnings.patch
@@ -7,7 +7,7 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 37bf4f356a23224fb5da949e8311c895c3529cf8..03befb9a39b7668ff5ec2e72ab68bbc0dd52f007 100644
+index d2a09822104c954f06f64ad2a63012e433088169..8d9e2573c6d9597699e74f19989dcde600a5fb61 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2326,7 +2326,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0061-Do-not-log-Not-Secure-marker.patch b/patches/server/0062-Do-not-log-Not-Secure-marker.patch
similarity index 100%
rename from patches/server/0061-Do-not-log-Not-Secure-marker.patch
rename to patches/server/0062-Do-not-log-Not-Secure-marker.patch
diff --git a/patches/server/0062-Do-not-log-run-as-root-warning.patch b/patches/server/0063-Do-not-log-run-as-root-warning.patch
similarity index 100%
rename from patches/server/0062-Do-not-log-run-as-root-warning.patch
rename to patches/server/0063-Do-not-log-run-as-root-warning.patch
diff --git a/patches/server/0063-Do-not-log-offline-mode-warning.patch b/patches/server/0064-Do-not-log-offline-mode-warning.patch
similarity index 100%
rename from patches/server/0063-Do-not-log-offline-mode-warning.patch
rename to patches/server/0064-Do-not-log-offline-mode-warning.patch
diff --git a/patches/server/0064-Softly-log-invalid-pool-element-errors.patch b/patches/server/0065-Softly-log-invalid-pool-element-errors.patch
similarity index 100%
rename from patches/server/0064-Softly-log-invalid-pool-element-errors.patch
rename to patches/server/0065-Softly-log-invalid-pool-element-errors.patch
diff --git a/patches/server/0065-Fix-legacy-colors-in-console.patch b/patches/server/0066-Fix-legacy-colors-in-console.patch
similarity index 100%
rename from patches/server/0065-Fix-legacy-colors-in-console.patch
rename to patches/server/0066-Fix-legacy-colors-in-console.patch
diff --git a/patches/server/0066-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0067-Fix-outdated-server-showing-in-ping-before-server-fu.patch
similarity index 100%
rename from patches/server/0066-Fix-outdated-server-showing-in-ping-before-server-fu.patch
rename to patches/server/0067-Fix-outdated-server-showing-in-ping-before-server-fu.patch
diff --git a/patches/server/0067-Make-sand-duping-fix-configurable.patch b/patches/server/0068-Make-sand-duping-fix-configurable.patch
similarity index 97%
rename from patches/server/0067-Make-sand-duping-fix-configurable.patch
rename to patches/server/0068-Make-sand-duping-fix-configurable.patch
index 3314ddb..4122fcc 100644
--- a/patches/server/0067-Make-sand-duping-fix-configurable.patch
+++ b/patches/server/0068-Make-sand-duping-fix-configurable.patch
@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 72f1866226269396ba0f0c1be269e237925d9322..ea099989d633764489396a48d52db9f6023a20af 100644
+index eacb8a407fe99af2c13f23c12b5544696bda8890..df8487488bcce6a8ae4cd7c995ab61cae04acbb6 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -130,7 +130,7 @@ public class FallingBlockEntity extends Entity {
diff --git a/patches/server/0068-Fix-MC-238526.patch b/patches/server/0069-Fix-MC-238526.patch
similarity index 100%
rename from patches/server/0068-Fix-MC-238526.patch
rename to patches/server/0069-Fix-MC-238526.patch
diff --git a/patches/server/0069-Fix-MC-123848.patch b/patches/server/0070-Fix-MC-123848.patch
similarity index 100%
rename from patches/server/0069-Fix-MC-123848.patch
rename to patches/server/0070-Fix-MC-123848.patch
diff --git a/patches/server/0070-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0071-Fix-cow-rotation-when-shearing-mooshroom.patch
similarity index 100%
rename from patches/server/0070-Fix-cow-rotation-when-shearing-mooshroom.patch
rename to patches/server/0071-Fix-cow-rotation-when-shearing-mooshroom.patch
diff --git a/patches/server/0071-Fix-MC-121706.patch b/patches/server/0072-Fix-MC-121706.patch
similarity index 100%
rename from patches/server/0071-Fix-MC-121706.patch
rename to patches/server/0072-Fix-MC-121706.patch
diff --git a/patches/server/0072-Fix-MC-110386.patch b/patches/server/0073-Fix-MC-110386.patch
similarity index 100%
rename from patches/server/0072-Fix-MC-110386.patch
rename to patches/server/0073-Fix-MC-110386.patch
diff --git a/patches/server/0073-Fix-MC-31819.patch b/patches/server/0074-Fix-MC-31819.patch
similarity index 100%
rename from patches/server/0073-Fix-MC-31819.patch
rename to patches/server/0074-Fix-MC-31819.patch
diff --git a/patches/server/0074-Fix-MC-26304.patch b/patches/server/0075-Fix-MC-26304.patch
similarity index 100%
rename from patches/server/0074-Fix-MC-26304.patch
rename to patches/server/0075-Fix-MC-26304.patch
diff --git a/patches/server/0075-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0076-End-gateway-should-check-if-entity-can-use-portal.patch
similarity index 100%
rename from patches/server/0075-End-gateway-should-check-if-entity-can-use-portal.patch
rename to patches/server/0076-End-gateway-should-check-if-entity-can-use-portal.patch
diff --git a/patches/server/0076-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch b/patches/server/0077-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch
similarity index 100%
rename from patches/server/0076-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch
rename to patches/server/0077-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch
diff --git a/patches/server/0077-Make-arrow-movement-resetting-despawn-counter-config.patch b/patches/server/0078-Make-arrow-movement-resetting-despawn-counter-config.patch
similarity index 100%
rename from patches/server/0077-Make-arrow-movement-resetting-despawn-counter-config.patch
rename to patches/server/0078-Make-arrow-movement-resetting-despawn-counter-config.patch
diff --git a/patches/server/0078-Make-logging-login-locations-configurable.patch b/patches/server/0079-Make-logging-login-locations-configurable.patch
similarity index 100%
rename from patches/server/0078-Make-logging-login-locations-configurable.patch
rename to patches/server/0079-Make-logging-login-locations-configurable.patch
diff --git a/patches/server/0079-Reduce-array-allocations.patch b/patches/server/0080-Reduce-array-allocations.patch
similarity index 100%
rename from patches/server/0079-Reduce-array-allocations.patch
rename to patches/server/0080-Reduce-array-allocations.patch
diff --git a/patches/server/0080-Optimize-sun-burn-tick.patch b/patches/server/0081-Optimize-sun-burn-tick.patch
similarity index 97%
rename from patches/server/0080-Optimize-sun-burn-tick.patch
rename to patches/server/0081-Optimize-sun-burn-tick.patch
index df59170..29cc303 100644
--- a/patches/server/0080-Optimize-sun-burn-tick.patch
+++ b/patches/server/0081-Optimize-sun-burn-tick.patch
@@ -13,7 +13,7 @@ As part of: JettPack (https://gitlab.com/Titaniumtown/JettPack)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ca5b6a05ea3a3005d4a46f8581f498f6aadaee74..c8665f26723d315e09a96ff9a7e4688ce131a3e7 100644
+index cd705a59d63eaaf090c63f5c3d088db3cb1afa16..73824358e299c39fe7ea2d07d90ec1e25bb29f2f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -290,7 +290,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0081-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0082-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
similarity index 100%
rename from patches/server/0081-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
rename to patches/server/0082-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
diff --git a/patches/server/0082-Replace-AI-goal-set-with-optimized-collection.patch b/patches/server/0083-Replace-AI-goal-set-with-optimized-collection.patch
similarity index 100%
rename from patches/server/0082-Replace-AI-goal-set-with-optimized-collection.patch
rename to patches/server/0083-Replace-AI-goal-set-with-optimized-collection.patch
diff --git a/patches/server/0083-Replace-game-rules-map-with-optimized-collection.patch b/patches/server/0084-Replace-game-rules-map-with-optimized-collection.patch
similarity index 100%
rename from patches/server/0083-Replace-game-rules-map-with-optimized-collection.patch
rename to patches/server/0084-Replace-game-rules-map-with-optimized-collection.patch
diff --git a/patches/server/0084-Replace-AI-attributes-with-optimized-collections.patch b/patches/server/0085-Replace-AI-attributes-with-optimized-collections.patch
similarity index 100%
rename from patches/server/0084-Replace-AI-attributes-with-optimized-collections.patch
rename to patches/server/0085-Replace-AI-attributes-with-optimized-collections.patch
diff --git a/patches/server/0085-Replace-class-map-with-optimized-collection.patch b/patches/server/0086-Replace-class-map-with-optimized-collection.patch
similarity index 100%
rename from patches/server/0085-Replace-class-map-with-optimized-collection.patch
rename to patches/server/0086-Replace-class-map-with-optimized-collection.patch
diff --git a/patches/server/0086-Replace-throttle-tracker-map-with-optimized-collecti.patch b/patches/server/0087-Replace-throttle-tracker-map-with-optimized-collecti.patch
similarity index 100%
rename from patches/server/0086-Replace-throttle-tracker-map-with-optimized-collecti.patch
rename to patches/server/0087-Replace-throttle-tracker-map-with-optimized-collecti.patch
diff --git a/patches/server/0087-Replace-shape-full-block-cache-with-hashtable.patch b/patches/server/0088-Replace-shape-full-block-cache-with-hashtable.patch
similarity index 100%
rename from patches/server/0087-Replace-shape-full-block-cache-with-hashtable.patch
rename to patches/server/0088-Replace-shape-full-block-cache-with-hashtable.patch
diff --git a/patches/server/0088-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0089-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
similarity index 100%
rename from patches/server/0088-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
rename to patches/server/0089-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
diff --git a/patches/server/0089-Cache-BlockStatePairKey-hash.patch b/patches/server/0090-Cache-BlockStatePairKey-hash.patch
similarity index 100%
rename from patches/server/0089-Cache-BlockStatePairKey-hash.patch
rename to patches/server/0090-Cache-BlockStatePairKey-hash.patch
diff --git a/patches/server/0090-Cache-CubeVoxelShape-shape-array.patch b/patches/server/0091-Cache-CubeVoxelShape-shape-array.patch
similarity index 100%
rename from patches/server/0090-Cache-CubeVoxelShape-shape-array.patch
rename to patches/server/0091-Cache-CubeVoxelShape-shape-array.patch
diff --git a/patches/server/0091-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0092-Replace-division-by-multiplication-in-CubePointRange.patch
similarity index 100%
rename from patches/server/0091-Replace-division-by-multiplication-in-CubePointRange.patch
rename to patches/server/0092-Replace-division-by-multiplication-in-CubePointRange.patch
diff --git a/patches/server/0092-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0093-Replace-parts-by-size-in-CubePointRange.patch
similarity index 100%
rename from patches/server/0092-Replace-parts-by-size-in-CubePointRange.patch
rename to patches/server/0093-Replace-parts-by-size-in-CubePointRange.patch
diff --git a/patches/server/0093-Check-frozen-ticks-before-landing-block.patch b/patches/server/0094-Check-frozen-ticks-before-landing-block.patch
similarity index 94%
rename from patches/server/0093-Check-frozen-ticks-before-landing-block.patch
rename to patches/server/0094-Check-frozen-ticks-before-landing-block.patch
index 5c15b81..076094f 100644
--- a/patches/server/0093-Check-frozen-ticks-before-landing-block.patch
+++ b/patches/server/0094-Check-frozen-ticks-before-landing-block.patch
@@ -13,7 +13,7 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric)
 Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5c0c1100dc5bec3978f514f4403f9ee2c0352dc9..e5574a6349d3649392be3f001242782a34a0cb57 100644
+index 8ea5861bc9ae59c15ee6db042c769046f74abeed..25829f5b2675e1eafef5f5a0e40db8a4bbc80ba4 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -571,11 +571,10 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0094-Faster-chunk-serialization.patch b/patches/server/0095-Faster-chunk-serialization.patch
similarity index 100%
rename from patches/server/0094-Faster-chunk-serialization.patch
rename to patches/server/0095-Faster-chunk-serialization.patch
diff --git a/patches/server/0095-Update-boss-bar-within-tick.patch b/patches/server/0096-Update-boss-bar-within-tick.patch
similarity index 100%
rename from patches/server/0095-Update-boss-bar-within-tick.patch
rename to patches/server/0096-Update-boss-bar-within-tick.patch
diff --git a/patches/server/0096-Cache-ominous-banner-item.patch b/patches/server/0097-Cache-ominous-banner-item.patch
similarity index 100%
rename from patches/server/0096-Cache-ominous-banner-item.patch
rename to patches/server/0097-Cache-ominous-banner-item.patch
diff --git a/patches/server/0097-Optimize-world-generation-chunk-and-block-access.patch b/patches/server/0098-Optimize-world-generation-chunk-and-block-access.patch
similarity index 100%
rename from patches/server/0097-Optimize-world-generation-chunk-and-block-access.patch
rename to patches/server/0098-Optimize-world-generation-chunk-and-block-access.patch
diff --git a/patches/server/0098-Cache-world-generator-sea-level.patch b/patches/server/0099-Cache-world-generator-sea-level.patch
similarity index 100%
rename from patches/server/0098-Cache-world-generator-sea-level.patch
rename to patches/server/0099-Cache-world-generator-sea-level.patch
diff --git a/patches/server/0099-Skip-secondary-POI-sensor-if-absent.patch b/patches/server/0100-Skip-secondary-POI-sensor-if-absent.patch
similarity index 100%
rename from patches/server/0099-Skip-secondary-POI-sensor-if-absent.patch
rename to patches/server/0100-Skip-secondary-POI-sensor-if-absent.patch
diff --git a/patches/server/0100-Optimize-villager-data-storage.patch b/patches/server/0101-Optimize-villager-data-storage.patch
similarity index 100%
rename from patches/server/0100-Optimize-villager-data-storage.patch
rename to patches/server/0101-Optimize-villager-data-storage.patch
diff --git a/patches/server/0101-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0102-Skip-entity-move-if-movement-is-zero.patch
similarity index 96%
rename from patches/server/0101-Skip-entity-move-if-movement-is-zero.patch
rename to patches/server/0102-Skip-entity-move-if-movement-is-zero.patch
index cbb212a..d710363 100644
--- a/patches/server/0101-Skip-entity-move-if-movement-is-zero.patch
+++ b/patches/server/0102-Skip-entity-move-if-movement-is-zero.patch
@@ -13,7 +13,7 @@ As part of: VMP (https://github.com/RelativityMC/VMP-fabric)
 Licensed under: MIT (https://opensource.org/licenses/MIT)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c8665f26723d315e09a96ff9a7e4688ce131a3e7..bf3bdbdb4384f374419f00635280305f84ce078c 100644
+index 73824358e299c39fe7ea2d07d90ec1e25bb29f2f..7766e57fe4e15adb7b6b80bf9a5fd763ce1282c2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -299,6 +299,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0102-Store-mob-counts-in-an-array.patch b/patches/server/0103-Store-mob-counts-in-an-array.patch
similarity index 100%
rename from patches/server/0102-Store-mob-counts-in-an-array.patch
rename to patches/server/0103-Store-mob-counts-in-an-array.patch
diff --git a/patches/server/0103-Use-linked-map-for-entity-trackers.patch b/patches/server/0104-Use-linked-map-for-entity-trackers.patch
similarity index 100%
rename from patches/server/0103-Use-linked-map-for-entity-trackers.patch
rename to patches/server/0104-Use-linked-map-for-entity-trackers.patch
diff --git a/patches/server/0104-Optimize-noise-generation.patch b/patches/server/0105-Optimize-noise-generation.patch
similarity index 100%
rename from patches/server/0104-Optimize-noise-generation.patch
rename to patches/server/0105-Optimize-noise-generation.patch
diff --git a/patches/server/0105-Optimize-sheep-offspring-color.patch b/patches/server/0106-Optimize-sheep-offspring-color.patch
similarity index 100%
rename from patches/server/0105-Optimize-sheep-offspring-color.patch
rename to patches/server/0106-Optimize-sheep-offspring-color.patch
diff --git a/patches/server/0106-Ignore-durability-change-equipment-updates.patch b/patches/server/0107-Ignore-durability-change-equipment-updates.patch
similarity index 100%
rename from patches/server/0106-Ignore-durability-change-equipment-updates.patch
rename to patches/server/0107-Ignore-durability-change-equipment-updates.patch
diff --git a/patches/server/0107-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0108-Hide-flames-on-entities-with-fire-resistance.patch
similarity index 96%
rename from patches/server/0107-Hide-flames-on-entities-with-fire-resistance.patch
rename to patches/server/0108-Hide-flames-on-entities-with-fire-resistance.patch
index 49221e9..5de2fc1 100644
--- a/patches/server/0107-Hide-flames-on-entities-with-fire-resistance.patch
+++ b/patches/server/0108-Hide-flames-on-entities-with-fire-resistance.patch
@@ -13,7 +13,7 @@ As part of: Slice (https://github.com/Cryptite/Slice)
 Licensed under: MIT (https://opensource.org/licenses/MIT)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bf3bdbdb4384f374419f00635280305f84ce078c..0ce745f5a00d4db68e8559fc1826dace52ae44d8 100644
+index 7766e57fe4e15adb7b6b80bf9a5fd763ce1282c2..deff1fa31d41445fb796cae8e5e4e3249f235ea0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -869,7 +869,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0108-Skip-cloning-advancement-criteria.patch b/patches/server/0109-Skip-cloning-advancement-criteria.patch
similarity index 100%
rename from patches/server/0108-Skip-cloning-advancement-criteria.patch
rename to patches/server/0109-Skip-cloning-advancement-criteria.patch
diff --git a/patches/server/0109-Reduce-block-destruction-packet-allocations.patch b/patches/server/0110-Reduce-block-destruction-packet-allocations.patch
similarity index 100%
rename from patches/server/0109-Reduce-block-destruction-packet-allocations.patch
rename to patches/server/0110-Reduce-block-destruction-packet-allocations.patch
diff --git a/patches/server/0110-Send-set-head-rotation-packets-only-for-living-entit.patch b/patches/server/0111-Send-set-head-rotation-packets-only-for-living-entit.patch
similarity index 100%
rename from patches/server/0110-Send-set-head-rotation-packets-only-for-living-entit.patch
rename to patches/server/0111-Send-set-head-rotation-packets-only-for-living-entit.patch
diff --git a/patches/server/0111-Player-canSee-by-entity-UUID.patch b/patches/server/0112-Player-canSee-by-entity-UUID.patch
similarity index 100%
rename from patches/server/0111-Player-canSee-by-entity-UUID.patch
rename to patches/server/0112-Player-canSee-by-entity-UUID.patch
diff --git a/patches/server/0112-Spread-out-sending-all-player-info.patch b/patches/server/0113-Spread-out-sending-all-player-info.patch
similarity index 100%
rename from patches/server/0112-Spread-out-sending-all-player-info.patch
rename to patches/server/0113-Spread-out-sending-all-player-info.patch
diff --git a/patches/server/0113-Optimize-player-list-for-sending-player-info.patch b/patches/server/0114-Optimize-player-list-for-sending-player-info.patch
similarity index 100%
rename from patches/server/0113-Optimize-player-list-for-sending-player-info.patch
rename to patches/server/0114-Optimize-player-list-for-sending-player-info.patch
diff --git a/patches/server/0114-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0115-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
similarity index 100%
rename from patches/server/0114-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
rename to patches/server/0115-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
diff --git a/patches/server/0115-Send-multiple-keep-alive-packets.patch b/patches/server/0116-Send-multiple-keep-alive-packets.patch
similarity index 98%
rename from patches/server/0115-Send-multiple-keep-alive-packets.patch
rename to patches/server/0116-Send-multiple-keep-alive-packets.patch
index 8ba152e..e3b0a28 100644
--- a/patches/server/0115-Send-multiple-keep-alive-packets.patch
+++ b/patches/server/0116-Send-multiple-keep-alive-packets.patch
@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 66fb07316734927c4f3df1bec36ad3738f841822..7df5ea545c19ccc43f553a229722c3fd88adc3ec 100644
+index f8ba64187acb6148f81b2c652813e6637c151bf0..4d7faeda716c5ac053cfb1d894f5a28e3a69f969 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -7,6 +7,8 @@ import com.mojang.brigadier.StringReader;
diff --git a/patches/server/0116-Make-slow-login-timeout-configurable.patch b/patches/server/0117-Make-slow-login-timeout-configurable.patch
similarity index 96%
rename from patches/server/0116-Make-slow-login-timeout-configurable.patch
rename to patches/server/0117-Make-slow-login-timeout-configurable.patch
index 725a89d..fa619cf 100644
--- a/patches/server/0116-Make-slow-login-timeout-configurable.patch
+++ b/patches/server/0117-Make-slow-login-timeout-configurable.patch
@@ -7,7 +7,7 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 2ed3f42b1e487374287d033ac634a922a5ef37bd..af96c170c58553f4ce0554c9bd24fea2ad96ed01 100644
+index be73149535c5fd8914db99bb835f4cbb731b63be..9b924f0793d8231244c160a5bc7ac8e1a35bad34 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -37,6 +37,7 @@ import net.minecraft.util.Crypt;
diff --git a/patches/server/0117-Make-max-interaction-distance-configurable.patch b/patches/server/0118-Make-max-interaction-distance-configurable.patch
similarity index 98%
rename from patches/server/0117-Make-max-interaction-distance-configurable.patch
rename to patches/server/0118-Make-max-interaction-distance-configurable.patch
index 38e6547..ae6d31f 100644
--- a/patches/server/0117-Make-max-interaction-distance-configurable.patch
+++ b/patches/server/0118-Make-max-interaction-distance-configurable.patch
@@ -20,7 +20,7 @@ index 58b093bb1de78ee3b3b2ea364aa50474883f443a..7be34e5df2b6d33c1d7943c9c0b6fd06
              this.debugLogging(pos, false, sequence, "too far");
          } else if (pos.getY() >= worldHeight) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7df5ea545c19ccc43f553a229722c3fd88adc3ec..68e0f2208c5f098042ebfad08301e3154e2a2152 100644
+index 4d7faeda716c5ac053cfb1d894f5a28e3a69f969..14ee62567ace6fc1becf4257761a811d2ab6f71d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -250,7 +250,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0118-Load-portal-destination-chunk-before-entity-teleport.patch b/patches/server/0119-Load-portal-destination-chunk-before-entity-teleport.patch
similarity index 97%
rename from patches/server/0118-Load-portal-destination-chunk-before-entity-teleport.patch
rename to patches/server/0119-Load-portal-destination-chunk-before-entity-teleport.patch
index d4dbb06..b6bddfe 100644
--- a/patches/server/0118-Load-portal-destination-chunk-before-entity-teleport.patch
+++ b/patches/server/0119-Load-portal-destination-chunk-before-entity-teleport.patch
@@ -13,7 +13,7 @@ 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/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0ce745f5a00d4db68e8559fc1826dace52ae44d8..54dac74a5de4f967b3af7a63c8977d569a90157b 100644
+index deff1fa31d41445fb796cae8e5e4e3249f235ea0..0ed0635ef581705d07934b9b17a63a4c7e19f6e1 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3456,6 +3456,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0119-Don-t-load-chunks-to-spawn-phantoms.patch b/patches/server/0120-Don-t-load-chunks-to-spawn-phantoms.patch
similarity index 100%
rename from patches/server/0119-Don-t-load-chunks-to-spawn-phantoms.patch
rename to patches/server/0120-Don-t-load-chunks-to-spawn-phantoms.patch
diff --git a/patches/server/0120-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0121-Don-t-load-chunks-to-activate-climbing-entities.patch
similarity index 96%
rename from patches/server/0120-Don-t-load-chunks-to-activate-climbing-entities.patch
rename to patches/server/0121-Don-t-load-chunks-to-activate-climbing-entities.patch
index d48c6a8..88db6e2 100644
--- a/patches/server/0120-Don-t-load-chunks-to-activate-climbing-entities.patch
+++ b/patches/server/0121-Don-t-load-chunks-to-activate-climbing-entities.patch
@@ -7,7 +7,7 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 54dac74a5de4f967b3af7a63c8977d569a90157b..71a2f7d6f4f737cb5f553bd06e588383f211633d 100644
+index 0ed0635ef581705d07934b9b17a63a4c7e19f6e1..650a0f0ada672d050c1d1d52b33fe74dfa1ef5ed 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4314,6 +4314,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -28,7 +28,7 @@ index 54dac74a5de4f967b3af7a63c8977d569a90157b..71a2f7d6f4f737cb5f553bd06e588383
          return this.chunkPosition;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e9554db6c331beec32ce11bb6a939bb909b1a877..714863ce4d401887119a6eab49a6c0413edb889d 100644
+index 0cc1008b3db93487c8e0801895264683f6d2e439..87499e82e80a8b7d6d8ca6eeaa1819b74fcf1665 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1948,19 +1948,43 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0121-Broadcast-crit-animations-as-the-entity-being-critte.patch b/patches/server/0122-Broadcast-crit-animations-as-the-entity-being-critte.patch
similarity index 100%
rename from patches/server/0121-Broadcast-crit-animations-as-the-entity-being-critte.patch
rename to patches/server/0122-Broadcast-crit-animations-as-the-entity-being-critte.patch
diff --git a/patches/server/0122-Ignore-null-legacy-structure-data.patch b/patches/server/0123-Ignore-null-legacy-structure-data.patch
similarity index 100%
rename from patches/server/0122-Ignore-null-legacy-structure-data.patch
rename to patches/server/0123-Ignore-null-legacy-structure-data.patch
diff --git a/patches/server/0123-Don-t-double-save-stored-user-lists.patch b/patches/server/0124-Don-t-double-save-stored-user-lists.patch
similarity index 100%
rename from patches/server/0123-Don-t-double-save-stored-user-lists.patch
rename to patches/server/0124-Don-t-double-save-stored-user-lists.patch
diff --git a/patches/server/0124-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0125-Skip-unnecessary-mob-spawning-computations.patch
similarity index 100%
rename from patches/server/0124-Skip-unnecessary-mob-spawning-computations.patch
rename to patches/server/0125-Skip-unnecessary-mob-spawning-computations.patch
diff --git a/patches/server/0125-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0126-Prevent-entities-random-strolling-into-non-ticking-c.patch
similarity index 100%
rename from patches/server/0125-Prevent-entities-random-strolling-into-non-ticking-c.patch
rename to patches/server/0126-Prevent-entities-random-strolling-into-non-ticking-c.patch
diff --git a/patches/server/0126-Do-not-place-player-in-world-if-kicked-before-being-.patch b/patches/server/0127-Do-not-place-player-in-world-if-kicked-before-being-.patch
similarity index 94%
rename from patches/server/0126-Do-not-place-player-in-world-if-kicked-before-being-.patch
rename to patches/server/0127-Do-not-place-player-in-world-if-kicked-before-being-.patch
index df0559f..7fdfa32 100644
--- a/patches/server/0126-Do-not-place-player-in-world-if-kicked-before-being-.patch
+++ b/patches/server/0127-Do-not-place-player-in-world-if-kicked-before-being-.patch
@@ -14,7 +14,7 @@ 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/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e80346c56a6b47d684b49dfaa066fc0314fd59ae..ac12cde39125f3b9dc57f251dd124739422426f9 100644
+index 4662b789af0bbab91102234d47b5785075762a2e..6f139e6cbb61bfb2be9b8b886bec7cddbb2c8993 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -253,6 +253,13 @@ public abstract class PlayerList {
diff --git a/patches/server/0127-CraftBukkit-UUID-to-world-map.patch b/patches/server/0128-CraftBukkit-UUID-to-world-map.patch
similarity index 100%
rename from patches/server/0127-CraftBukkit-UUID-to-world-map.patch
rename to patches/server/0128-CraftBukkit-UUID-to-world-map.patch
diff --git a/patches/server/0128-Global-EULA-file.patch b/patches/server/0129-Global-EULA-file.patch
similarity index 100%
rename from patches/server/0128-Global-EULA-file.patch
rename to patches/server/0129-Global-EULA-file.patch
diff --git a/patches/server/0129-Specific-interval-TPS-API.patch b/patches/server/0130-Specific-interval-TPS-API.patch
similarity index 100%
rename from patches/server/0129-Specific-interval-TPS-API.patch
rename to patches/server/0130-Specific-interval-TPS-API.patch
diff --git a/patches/server/0130-5-second-TPS-average.patch b/patches/server/0131-5-second-TPS-average.patch
similarity index 100%
rename from patches/server/0130-5-second-TPS-average.patch
rename to patches/server/0131-5-second-TPS-average.patch
diff --git a/patches/server/0131-Measure-last-tick-time.patch b/patches/server/0132-Measure-last-tick-time.patch
similarity index 100%
rename from patches/server/0131-Measure-last-tick-time.patch
rename to patches/server/0132-Measure-last-tick-time.patch
diff --git a/patches/server/0132-Last-tick-time-API.patch b/patches/server/0133-Last-tick-time-API.patch
similarity index 100%
rename from patches/server/0132-Last-tick-time-API.patch
rename to patches/server/0133-Last-tick-time-API.patch
diff --git a/patches/server/0133-Show-last-tick-time-in-tps-command.patch b/patches/server/0134-Show-last-tick-time-in-tps-command.patch
similarity index 100%
rename from patches/server/0133-Show-last-tick-time-in-tps-command.patch
rename to patches/server/0134-Show-last-tick-time-in-tps-command.patch
diff --git a/patches/server/0134-Increase-time-statistics-in-intervals.patch b/patches/server/0135-Increase-time-statistics-in-intervals.patch
similarity index 100%
rename from patches/server/0134-Increase-time-statistics-in-intervals.patch
rename to patches/server/0135-Increase-time-statistics-in-intervals.patch
diff --git a/patches/server/0135-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0136-For-collision-check-has-physics-before-same-vehicle.patch
similarity index 94%
rename from patches/server/0135-For-collision-check-has-physics-before-same-vehicle.patch
rename to patches/server/0136-For-collision-check-has-physics-before-same-vehicle.patch
index 69255ce..b56aeb4 100644
--- a/patches/server/0135-For-collision-check-has-physics-before-same-vehicle.patch
+++ b/patches/server/0136-For-collision-check-has-physics-before-same-vehicle.patch
@@ -16,7 +16,7 @@ As part of: Akarin (https://github.com/Akarin-project/Akarin)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 71a2f7d6f4f737cb5f553bd06e588383f211633d..a08c46c10630007a10e1dd1ba0c37ad25d847529 100644
+index 650a0f0ada672d050c1d1d52b33fe74dfa1ef5ed..42467f5d99039bb6815b6abdf4ede39821d6be56 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1984,8 +1984,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0136-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0137-Skip-negligible-planar-movement-multiplication.patch
similarity index 94%
rename from patches/server/0136-Skip-negligible-planar-movement-multiplication.patch
rename to patches/server/0137-Skip-negligible-planar-movement-multiplication.patch
index a059491..5eeccc0 100644
--- a/patches/server/0136-Skip-negligible-planar-movement-multiplication.patch
+++ b/patches/server/0137-Skip-negligible-planar-movement-multiplication.patch
@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a08c46c10630007a10e1dd1ba0c37ad25d847529..5133905fbde6c507983554830413738dae09a269 100644
+index 42467f5d99039bb6815b6abdf4ede39821d6be56..ce197df36b3746dbd511287ecd78e46eaec3d5e0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1188,9 +1188,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0137-Optimize-identical-item-checks.patch b/patches/server/0138-Optimize-identical-item-checks.patch
similarity index 100%
rename from patches/server/0137-Optimize-identical-item-checks.patch
rename to patches/server/0138-Optimize-identical-item-checks.patch
diff --git a/patches/server/0138-Reduce-RandomSource-instances.patch b/patches/server/0139-Reduce-RandomSource-instances.patch
similarity index 99%
rename from patches/server/0138-Reduce-RandomSource-instances.patch
rename to patches/server/0139-Reduce-RandomSource-instances.patch
index 757af7c..edaa782 100644
--- a/patches/server/0138-Reduce-RandomSource-instances.patch
+++ b/patches/server/0139-Reduce-RandomSource-instances.patch
@@ -96,7 +96,7 @@ index b13ef853419d2783d09b3e685b9b506a4ff5676e..7a7e87954868c3eb267d3255652d67d3
          this.level = world;
          this.id = nbt.getInt("Id");
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index d3ade2eb7c492cd8fdb24c78fa2886db8986fc09..b6e537dd77f2eda819b00962284f36546a2bd158 100644
+index 5c7f2be28fbb5d2f7b48c04bb862fb15440dda03..10336cef8316d41f49eeb7811b84f4eea90df246 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -81,7 +81,7 @@ public class Explosion {
diff --git a/patches/server/0139-Server-thread-priority-environment-variable.patch b/patches/server/0140-Server-thread-priority-environment-variable.patch
similarity index 100%
rename from patches/server/0139-Server-thread-priority-environment-variable.patch
rename to patches/server/0140-Server-thread-priority-environment-variable.patch
diff --git a/patches/server/0140-Thread-safety-annotations.patch b/patches/server/0141-Thread-safety-annotations.patch
similarity index 100%
rename from patches/server/0140-Thread-safety-annotations.patch
rename to patches/server/0141-Thread-safety-annotations.patch
diff --git a/patches/server/0141-CPU-cores-estimation.patch b/patches/server/0142-CPU-cores-estimation.patch
similarity index 100%
rename from patches/server/0141-CPU-cores-estimation.patch
rename to patches/server/0142-CPU-cores-estimation.patch
diff --git a/patches/server/0142-Mutex-utility.patch b/patches/server/0143-Mutex-utility.patch
similarity index 96%
rename from patches/server/0142-Mutex-utility.patch
rename to patches/server/0143-Mutex-utility.patch
index 8b49db3..a585b45 100644
--- a/patches/server/0142-Mutex-utility.patch
+++ b/patches/server/0143-Mutex-utility.patch
@@ -8,10 +8,10 @@ Gale - https://galemc.org
 
 diff --git a/src/main/java/org/galemc/gale/concurrent/Mutex.java b/src/main/java/org/galemc/gale/concurrent/Mutex.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..56dcc0ec470743ab458f725b8fa7f5b9536102ad
+index 0000000000000000000000000000000000000000..f7bedd5cbe9b48ac94f8cc228a17c8a54db7d7e9
 --- /dev/null
 +++ b/src/main/java/org/galemc/gale/concurrent/Mutex.java
-@@ -0,0 +1,122 @@
+@@ -0,0 +1,123 @@
 +// Gale - mutex utility
 +
 +package org.galemc.gale.concurrent;
@@ -78,8 +78,9 @@ index 0000000000000000000000000000000000000000..56dcc0ec470743ab458f725b8fa7f5b9
 +     * Acquires this mutex in the style of a spin lock: repeatedly calls {@link #tryAcquire()} until successful.
 +     */
 +    default void spinLock() {
-+        //noinspection StatementWithEmptyBody
-+        while (!this.tryAcquire());
++        while (!this.tryAcquire()) {
++            Thread.onSpinWait();
++        }
 +    }
 +
 +    /**
diff --git a/patches/server/0143-Thread-aware-lock-utility.patch b/patches/server/0144-Thread-aware-lock-utility.patch
similarity index 100%
rename from patches/server/0143-Thread-aware-lock-utility.patch
rename to patches/server/0144-Thread-aware-lock-utility.patch
diff --git a/patches/server/0144-Unterminable-executor-utility.patch b/patches/server/0145-Unterminable-executor-utility.patch
similarity index 100%
rename from patches/server/0144-Unterminable-executor-utility.patch
rename to patches/server/0145-Unterminable-executor-utility.patch
diff --git a/patches/server/0145-FIFO-concurrent-queue-utility.patch b/patches/server/0146-FIFO-concurrent-queue-utility.patch
similarity index 100%
rename from patches/server/0145-FIFO-concurrent-queue-utility.patch
rename to patches/server/0146-FIFO-concurrent-queue-utility.patch
diff --git a/patches/server/0146-Base-thread-pool.patch b/patches/server/0147-Base-thread-pool.patch
similarity index 99%
rename from patches/server/0146-Base-thread-pool.patch
rename to patches/server/0147-Base-thread-pool.patch
index 9ef78b4..bea58cb 100644
--- a/patches/server/0146-Base-thread-pool.patch
+++ b/patches/server/0147-Base-thread-pool.patch
@@ -1851,7 +1851,7 @@ index 78f53ee557276de85f0431ebcb146445b1f4fb92..6176867eea06c53882dcaacfbde0334b
  
          return ret;
 diff --git a/src/main/java/org/galemc/gale/concurrent/Mutex.java b/src/main/java/org/galemc/gale/concurrent/Mutex.java
-index 56dcc0ec470743ab458f725b8fa7f5b9536102ad..d01949290487dbe8806427af82c0505dce79f60d 100644
+index f7bedd5cbe9b48ac94f8cc228a17c8a54db7d7e9..129ac4f70f2e7f176517af1e46ea36c5144473a0 100644
 --- a/src/main/java/org/galemc/gale/concurrent/Mutex.java
 +++ b/src/main/java/org/galemc/gale/concurrent/Mutex.java
 @@ -20,7 +20,7 @@ import java.util.concurrent.locks.Lock;
@@ -3411,10 +3411,10 @@ index 0000000000000000000000000000000000000000..cf8e2b42ecfc8205af5b105e19975c3e
 +}
 diff --git a/src/main/java/org/galemc/gale/executor/queue/ScheduledServerThreadTaskQueues.java b/src/main/java/org/galemc/gale/executor/queue/ScheduledServerThreadTaskQueues.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..3d1a54ad35887e87bf7ad8c75a1f5a9be65c1eb8
+index 0000000000000000000000000000000000000000..a763028deff9bc131b8208886bf2651373b1dbc3
 --- /dev/null
 +++ b/src/main/java/org/galemc/gale/executor/queue/ScheduledServerThreadTaskQueues.java
-@@ -0,0 +1,283 @@
+@@ -0,0 +1,287 @@
 +// Gale - base thread pool
 +
 +package org.galemc.gale.executor.queue;
@@ -3508,8 +3508,9 @@ index 0000000000000000000000000000000000000000..3d1a54ad35887e87bf7ad8c75a1f5a9b
 +     * finished within the current tick if {@code tryNonCurrentTickQueuesAtAll} is false.
 +     */
 +    public static boolean hasTasks(boolean tryNonCurrentTickQueuesAtAll) {
-+        //noinspection StatementWithEmptyBody
-+        while (!readLock.tryLock());
++        while (!readLock.tryLock()) {
++            Thread.onSpinWait();
++        }
 +        try {
 +            // Try the queue most likely to contain tasks first
 +            if (firstQueueWithPotentialTasksIndex == 0 || tryNonCurrentTickQueuesAtAll) {
@@ -3596,8 +3597,9 @@ index 0000000000000000000000000000000000000000..3d1a54ad35887e87bf7ad8c75a1f5a9b
 +    }
 +
 +    public static int getTaskCount() {
-+        //noinspection StatementWithEmptyBody
-+        while (!readLock.tryLock());
++        while (!readLock.tryLock()) {
++            Thread.onSpinWait();
++        }
 +        try {
 +            int count = 0;
 +            for (Queue<?> queue : queues) {
@@ -3635,8 +3637,9 @@ index 0000000000000000000000000000000000000000..3d1a54ad35887e87bf7ad8c75a1f5a9b
 +            return;
 +        }
 +        // Paper end - anything that does try to post to main during watchdog crash, run on watchdog
-+        //noinspection StatementWithEmptyBody
-+        while (!readLock.tryLock());
++        while (!readLock.tryLock()) {
++            Thread.onSpinWait();
++        }
 +        try {
 +            //noinspection NonAtomicOperationOnVolatileField
 +            versionStamp++;
@@ -3658,8 +3661,9 @@ index 0000000000000000000000000000000000000000..3d1a54ad35887e87bf7ad8c75a1f5a9b
 +     * This moves the queues in {@link #queues}.
 +     */
 +    public static void shiftTasksForNextTick() {
-+        //noinspection StatementWithEmptyBody
-+        while (!writeLock.tryLock());
++        while (!writeLock.tryLock()) {
++            Thread.onSpinWait();
++        }
 +        try {
 +            //noinspection NonAtomicOperationOnVolatileField
 +            versionStamp++;
diff --git a/patches/server/0148-Watch-for-blocking-base-threads.patch b/patches/server/0148-Watch-for-blocking-base-threads.patch
new file mode 100644
index 0000000..f439f0b
--- /dev/null
+++ b/patches/server/0148-Watch-for-blocking-base-threads.patch
@@ -0,0 +1,105 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Martijn Muijsers <martijnmuijsers@live.nl>
+Date: Fri, 3 Feb 2023 23:52:49 +0100
+Subject: [PATCH] Watch for blocking base threads
+
+License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
+Gale - https://galemc.org
+
+diff --git a/build.gradle.kts b/build.gradle.kts
+index 4b279948e82a6dfd2f471ba698e361dcfe4499de..438e7d8ce4e1df13a6a5cc45075996be10b34c7b 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -15,6 +15,7 @@ dependencies {
+         exclude("io.papermc.paper", "paper-api")
+     }
+     // Gale end - project setup
++    implementation("io.projectreactor.tools:blockhound:1.0.7.RELEASE") // Gale - base thread pool - watch for blocking base threads
+     // Paper start
+     implementation("org.jline:jline-terminal-jansi:3.21.0")
+     implementation("net.minecrell:terminalconsoleappender:1.3.0")
+@@ -169,10 +170,12 @@ fun TaskContainer.registerRunTask(
+     if (providers.gradleProperty("paper.runDisableWatchdog").getOrElse("false") == "true") {
+         systemProperty("disable.watchdog", true)
+     }
++    systemProperty("gale.detect.thread.blocks", true) // Gale - base thread pool - watch for blocking base threads
+ 
+     val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2")
+     val modifiedJvmArgs = jvmArgs ?: arrayListOf()
+     modifiedJvmArgs.addAll(listOf("-Xms${memoryGb}G", "-Xmx${memoryGb}G"))
++    modifiedJvmArgs.add("-XX:+AllowRedefinitionToAddDeleteMethods") // Gale - base thread pool - watch for blocking base threads
+     jvmArgs = modifiedJvmArgs
+ 
+     doFirst {
+diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
+index fab5d1c1531fa89113bef6d17df8437b0aec4582..7ec31bf30db664ade4ee4eaf22dccb4177f9262f 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -4,18 +4,19 @@ import java.io.File;
+ import java.io.IOException;
+ import java.text.DateFormat;
+ import java.text.SimpleDateFormat;
+-import java.util.Arrays;
+-import java.util.Calendar;
+-import java.util.Date;
+-import java.util.List;
++import java.util.*;
+ import java.util.concurrent.TimeUnit;
++import java.util.function.Consumer;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+ import joptsimple.OptionParser;
+ import joptsimple.OptionSet;
++import net.minecraft.server.MinecraftServer;
+ import net.minecraft.util.ExceptionCollector;
+ import net.minecraft.world.level.lighting.LayerLightEventListener;
+ import net.minecrell.terminalconsole.TerminalConsoleAppender; // Paper
++import org.galemc.gale.executor.thread.BaseThread;
++import reactor.blockhound.BlockHound;
+ 
+ public class Main {
+     public static boolean useJline = true;
+@@ -48,6 +49,43 @@ public class Main {
+     // Gale end - include time in startup logs
+ 
+     public static void main(String[] args) {
++        // Gale start - base thread pool - watch for blocking base threads
++        if (Boolean.getBoolean("gale.detect.thread.blocks")) {
++            printlnStartupInfoToSystemOut("Initializing blocking base thread detection...");
++            try {
++                var builder = BlockHound.builder()
++                // Mark base threads as intended to be non-blocking
++                builder.nonBlockingThreadPredicate(currentPredicate -> currentPredicate.or(thread -> thread instanceof BaseThread))
++                // Set the callback when a base thread blocks
++                builder.blockingMethodCallback(blockingMethod -> {
++                    String message = "A base thread (" + Thread.currentThread() + ") started blocking:";
++                    if (MinecraftServer.LOGGER != null) {
++                        MinecraftServer.LOGGER.error(message);
++                    } else {
++                        printlnStartupErrorToSystemOut(message);
++                    }
++                    new Error(blockingMethod.toString()).printStackTrace();
++                });
++                // Allow busy waiting
++                var blockingMethodsField = builder.getClass().getDeclaredField("blockingMethods");
++                blockingMethodsField.setAccessible(true);
++                Map<String, Map<String, Set<String>>> blockingMethods = (Map<String, Map<String, Set<String>>>) blockingMethodsField.get(builder);
++                Map<String, Set<String>> threadBlockingMethods = blockingMethods.get("java/lang/Thread");
++                threadBlockingMethods.remove("onSpinWait");
++                threadBlockingMethods.remove("yield");
++                // Allow base threads to block in the intended way
++                builder.allowBlockingCallsInside("org.galemc.gale.executor.thread.BaseThread", "waitUntilSignalled")
++                // Install BlockHound
++                builder.install();
++                printlnStartupInfoToSystemOut("Blocking base thread detection is enabled.");
++            } catch (Exception e) {
++                // BlockHound instrumentation failed, which probably means the needed JVM flag is missing
++                printlnStartupInfoToSystemOut("Blocking base thread detection is disabled.");
++                printlnStartupInfoToSystemOut("When it is enabled, unexpected thread blocks can be automatically resolved to improve performance.");
++                printlnStartupInfoToSystemOut("To enable it, add \"-XX:+AllowRedefinitionToAddDeleteMethods\" to your startup flags, BEFORE the \"-jar\".");
++            }
++        }
++        // Gale end - base thread pool - watch for blocking base threads
+         // Paper start
+         final String warnWhenLegacyFormattingDetected = String.join(".", "net", "kyori", "adventure", "text", "warnWhenLegacyFormattingDetected");
+         if (false && System.getProperty(warnWhenLegacyFormattingDetected) == null) {
diff --git a/patches/server/0147-Non-blocking-PooledObjects.patch b/patches/server/0149-Non-blocking-PooledObjects.patch
similarity index 100%
rename from patches/server/0147-Non-blocking-PooledObjects.patch
rename to patches/server/0149-Non-blocking-PooledObjects.patch
diff --git a/patches/server/0148-Yielding-memoized-Supplier.patch b/patches/server/0150-Yielding-memoized-Supplier.patch
similarity index 100%
rename from patches/server/0148-Yielding-memoized-Supplier.patch
rename to patches/server/0150-Yielding-memoized-Supplier.patch
diff --git a/patches/server/0149-Run-async-executor-tasks-on-base-thread-pool.patch b/patches/server/0151-Run-async-executor-tasks-on-base-thread-pool.patch
similarity index 100%
rename from patches/server/0149-Run-async-executor-tasks-on-base-thread-pool.patch
rename to patches/server/0151-Run-async-executor-tasks-on-base-thread-pool.patch
diff --git a/patches/server/0150-Run-background-executor-tasks-on-base-thread-pool.patch b/patches/server/0152-Run-background-executor-tasks-on-base-thread-pool.patch
similarity index 100%
rename from patches/server/0150-Run-background-executor-tasks-on-base-thread-pool.patch
rename to patches/server/0152-Run-background-executor-tasks-on-base-thread-pool.patch
diff --git a/patches/server/0151-Run-world-upgrade-tasks-on-base-thread-pool.patch b/patches/server/0153-Run-world-upgrade-tasks-on-base-thread-pool.patch
similarity index 100%
rename from patches/server/0151-Run-world-upgrade-tasks-on-base-thread-pool.patch
rename to patches/server/0153-Run-world-upgrade-tasks-on-base-thread-pool.patch
diff --git a/patches/server/0152-Run-tab-completion-tasks-on-base-thread-pool.patch b/patches/server/0154-Run-tab-completion-tasks-on-base-thread-pool.patch
similarity index 100%
rename from patches/server/0152-Run-tab-completion-tasks-on-base-thread-pool.patch
rename to patches/server/0154-Run-tab-completion-tasks-on-base-thread-pool.patch
diff --git a/patches/server/0153-Run-text-filter-tasks-on-base-thread-pool.patch b/patches/server/0155-Run-text-filter-tasks-on-base-thread-pool.patch
similarity index 100%
rename from patches/server/0153-Run-text-filter-tasks-on-base-thread-pool.patch
rename to patches/server/0155-Run-text-filter-tasks-on-base-thread-pool.patch
diff --git a/patches/server/0154-Run-cleaner-tasks-on-base-thread-pool.patch b/patches/server/0156-Run-cleaner-tasks-on-base-thread-pool.patch
similarity index 100%
rename from patches/server/0154-Run-cleaner-tasks-on-base-thread-pool.patch
rename to patches/server/0156-Run-cleaner-tasks-on-base-thread-pool.patch
diff --git a/patches/server/0155-Run-chunk-cache-tasks-on-base-thread-pool.patch b/patches/server/0157-Run-chunk-cache-tasks-on-base-thread-pool.patch
similarity index 100%
rename from patches/server/0155-Run-chunk-cache-tasks-on-base-thread-pool.patch
rename to patches/server/0157-Run-chunk-cache-tasks-on-base-thread-pool.patch
diff --git a/patches/server/0156-Run-TickThread-chunk-tasks-on-base-thread-pool.patch b/patches/server/0158-Run-TickThread-chunk-tasks-on-base-thread-pool.patch
similarity index 100%
rename from patches/server/0156-Run-TickThread-chunk-tasks-on-base-thread-pool.patch
rename to patches/server/0158-Run-TickThread-chunk-tasks-on-base-thread-pool.patch
diff --git a/patches/server/0157-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch b/patches/server/0159-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch
similarity index 100%
rename from patches/server/0157-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch
rename to patches/server/0159-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch
diff --git a/patches/server/0158-Run-chunk-worker-tasks-on-base-thread-pool.patch b/patches/server/0160-Run-chunk-worker-tasks-on-base-thread-pool.patch
similarity index 100%
rename from patches/server/0158-Run-chunk-worker-tasks-on-base-thread-pool.patch
rename to patches/server/0160-Run-chunk-worker-tasks-on-base-thread-pool.patch
diff --git a/patches/server/0159-Split-tick-steps.patch b/patches/server/0161-Split-tick-steps.patch
similarity index 100%
rename from patches/server/0159-Split-tick-steps.patch
rename to patches/server/0161-Split-tick-steps.patch
diff --git a/patches/server/0160-Multithreaded-ticking.patch b/patches/server/0162-Multithreaded-ticking.patch
similarity index 100%
rename from patches/server/0160-Multithreaded-ticking.patch
rename to patches/server/0162-Multithreaded-ticking.patch