From 006fe7ce3a58e687183271f02e1331f23fc5bd99 Mon Sep 17 00:00:00 2001
From: Taiyou <77050201+Taiyou06@users.noreply.github.com>
Date: Thu, 24 Jul 2025 22:48:54 +0200
Subject: [PATCH] rewritten profile cache (#415)

* rewritten profile cache

* cleanup

* Fix build

* Update comments
---
 .../0134-Cache-player-profileResult.patch     |  97 ------------
 ...ed.patch => 0134-Matter-Secure-Seed.patch} |   0
 ... => 0135-Matter-Secure-Seed-command.patch} |   0
 ...tch => 0136-Faster-random-generator.patch} |   2 +-
 ...> 0137-Don-t-save-primed-tnt-entity.patch} |   0
 ...138-Don-t-save-falling-block-entity.patch} |   0
 ...139-Configurable-connection-message.patch} |   0
 ...onfigurable-unknown-command-message.patch} |   0
 ...-in-BlockBehaviour-cache-blockstate.patch} |   0
 ...am-in-entity-visible-effects-filter.patch} |   2 +-
 ...-double-iteration-in-enough-deep-sl.patch} |   0
 ...ove-stream-in-trial-spawner-ticking.patch} |   0
 ...atch => 0145-Remove-stream-in-Brain.patch} |   0
 ...0146-Remove-stream-in-BehaviorUtils.patch} |   0
 ... 0147-Remove-stream-in-YieldJobSite.patch} |   0
 ... 0148-Remove-stream-in-PlayerSensor.patch} |   0
 ...> 0149-Remove-stream-in-GolemSensor.patch} |   0
 ... 0150-Remove-stream-in-GateBehavior.patch} |   0
 ... 0151-Remove-stream-in-matchingSlot.patch} |   0
 ...entity-mountedOrDismounted-changes-.patch} |   0
 ...tive-effects-map-with-optimized-col.patch} |   2 +-
 ...erion-map-with-optimized-collection.patch} |   0
 ...ace-brain-with-optimized-collection.patch} |   0
 ...=> 0156-Reduce-worldgen-allocations.patch} |   0
 ...e-for-kickPermission-instead-of-usi.patch} |   2 +-
 ...-place-player-if-the-server-is-full.patch} |   0
 ...MC-65198.patch => 0159-Fix-MC-65198.patch} |   0
 ...-200418.patch => 0160-Fix-MC-200418.patch} |   0
 ...-119417.patch => 0161-Fix-MC-119417.patch} |   0
 ...-223153.patch => 0162-Fix-MC-223153.patch} |   0
 ...onfigurable-player-knockback-zombie.patch} |   2 +-
 ...during-inactive-ticks-for-non-aware.patch} |   0
 ...zombie-reinforcements-loading-chunk.patch} |   0
 ...aperPR-Fix-some-beacon-event-issues.patch} |   0
 ...67-Dont-send-useless-entity-packets.patch} |   0
 ...patch => 0168-Multithreaded-Tracker.patch} |   0
 ...0169-Nitori-Async-playerdata-saving.patch} |   0
 ...e-nearby-alive-players-for-spawning.patch} |   0
 ...> 0171-Cache-blockstate-cache-array.patch} |   0
 ....patch => 0172-Asynchronous-locator.patch} |   0
 ...tities-in-NearestLivingEntitySensor.patch} |   0
 ...uce-memory-footprint-of-CompoundTag.patch} |   0
 ... 0175-Optimize-Entity-distanceToSqr.patch} |   0
 ...e-snapshots-for-TileEntity-getOwner.patch} |   0
 ... => 0177-Cache-tile-entity-position.patch} |   0
 ...patch => 0178-TT20-Lag-compensation.patch} |   2 +-
 ...tch => 0179-C2ME-Reduce-Allocations.patch} |   0
 ...cessary-calculations-if-player-is-n.patch} |   2 +-
 ...til.patch => 0181-Lithium-fast-util.patch} |   0
 ...182-Lithium-cached-iterate-outwards.patch} |   0
 ...read-safe-ban-list-date-format-pars.patch} |   0
 ...> 0184-C2ME-Optimize-world-gen-math.patch} |   0
 ...k-key.patch => 0185-Cache-chunk-key.patch} |   2 +-
 ...0186-Cache-random-tick-block-status.patch} |   0
 ...7-Cache-part-of-canHoldFluid-result.patch} |   0
 ... => 0188-Configurable-tripwire-dupe.patch} |   0
 ...7075-Block-Entities-Unload-Lag-Spik.patch} |   0
 ...Rearrange-the-attackable-conditions.patch} |   0
 ...-dirty-stats-copy-when-requesting-p.patch} |   0
 ...t-dirty-flag-when-loading-maps-from.patch} |   2 +-
 ...hecking-nearby-players-for-spawning.patch} |   2 +-
 ...> 0194-Cache-supporting-block-check.patch} |   2 +-
 ...ue-clear-on-LevelTicks-cleanupAfter.patch} |   0
 ... => 0196-Remove-stream-in-villagers.patch} |   0
 ... 0197-Optimize-baby-villager-sensor.patch} |   0
 ....patch => 0198-Only-player-pushable.patch} |   2 +-
 ...199-Remove-iterators-from-Inventory.patch} |   0
 ....patch => 0200-optimize-mob-despawn.patch} |   0
 ...-Slightly-optimise-getNearestPlayer.patch} |   0
 ...writeLongArray-during-chunk-loading.patch} |   0
 ...3-Improve-sorting-in-SortedArraySet.patch} |   0
 ... 0204-Make-removeIf-slightly-faster.patch} |   0
 ...atch => 0205-Optimize-LinearPalette.patch} |   0
 ...206-Slightly-optimized-VarInt-write.patch} |   0
 ...te-ClientboundLightUpdatePacketData.patch} |   0
 ...g.patch => 0208-Async-chunk-sending.patch} |   0
 ...atch => 0209-Spawner-Configurations.patch} |   0
 ...SparklyPaper-Parallel-world-ticking.patch} |   0
 ...-SparklyPaper-Track-each-world-MSPT.patch} |   2 +-
 ...lled-Projectile-Events-still-consum.patch} |   0
 ...ndInteract-and-NearestVisibleLiving.patch} |   0
 ... => 0214-rewrite-InsideBrownianWalk.patch} |   0
 ...=> 0215-Use-BFS-on-getSlopeDistance.patch} |   2 +-
 ...r-PR-Throttle-failed-spawn-attempts.patch} |   0
 ...BlockEntity-ticking-isRemoved-check.patch} |   0
 ...8-Raytrace-AntiXray-SDK-integration.patch} |   2 +-
 ...timize-addOrUpdateTransientModifier.patch} |   0
 ... => 0220-Optimize-ContextMap.create.patch} |   0
 ...Micro-optimizations-for-random-tick.patch} |   2 +-
 ...n-updateConnectedPlayersWithinRange.patch} |   0
 ...23-Remove-streams-on-PlayerDetector.patch} |   0
 ...se-direct-iteration-on-Sensing.tick.patch} |   0
 ...5-Optimise-non-flush-packet-sending.patch} |   0
 ...unk-retrieving-in-entity-fluid-push.patch} |   2 +-
 ...-Null-handling-on-MultifaceSpreader.patch} |   0
 ....patch => 0228-More-virtual-threads.patch} |   0
 ....patch => 0229-Async-target-finding.patch} |   0
 ...imize-ThreadedTicketLevelPropagator.patch} |   0
 ...EffectUtil-getDigSpeedAmplification.patch} |   0
 ...patch => 0232-Optimise-chunkUnloads.patch} |   0
 ...33-Optimize-BlockEntityType-isValid.patch} |   0
 ...t-on-player-join-to-avoid-chunk-loa.patch} |   0
 ...yList-implementation-to-BasicEntity.patch} |   0
 ...ol-Core.patch => 0236-Protocol-Core.patch} |   0
 ... 0237-Async-switch-connection-state.patch} |   4 +-
 ...timize-BlockEntities-tickersInLevel.patch} |   0
 ...e-cactus-can-even-survive-being-pla.patch} |   0
 ...0240-Flush-location-while-knockback.patch} |   0
 ...tch => 0241-Only-tick-items-at-hand.patch} |   0
 ...art-sort-items-in-NearestItemSensor.patch} |   0
 ...243-Optimise-player-movement-checks.patch} |   2 +-
 ...=> 0244-Remove-streams-in-MobSensor.patch} |   0
 ...45-Remove-streams-in-TemptingSensor.patch} |   0
 ...0246-Use-HashedList-on-WeightedList.patch} |   0
 ...-death-item-drop-knockback-settings.patch} |   0
 ...-Optimize-getScaledTrackingDistance.patch} |   0
 ...ptimize-SynchedEntityData-packDirty.patch} |   0
 ...patch => 0250-Optimize-isEyeInFluid.patch} |   2 +-
 ...patch => 0251-Cache-block-path-type.patch} |   0
 ...ch => 0252-optimize-getEntityStatus.patch} |   0
 ...on-optimized-PoweredRailBlock-logic.patch} |   0
 ...4-optimise-ChunkGenerator-getMobsAt.patch} |   0
 ...tBiome.patch => 0255-cache-getBiome.patch} |   0
 ...patch => 0256-optimize-mob-spawning.patch} |   0
 ...atch => 0257-optimize-structure-map.patch} |   0
 ...patch => 0258-throttle-mob-spawning.patch} |   0
 ... => 0259-Add-BlockExplosionHitEvent.patch} |   0
 ...last-Protection-explosion-knockback.patch} |   0
 ...> 0261-Use-UUID-for-cure-reputation.patch} |   0
 ...ing-parsing-unknown-command-message.patch} |   0
 ....patch => 0263-optimize-random-tick.patch} |   0
 ...nvalid-flatten-text-component-parse.patch} |   0
 ...-Fast-BiomeManager-seed-obfuscation.patch} |   0
 ...ectorOptions-map-with-optimized-col.patch} |   0
 ...tch => 0267-optimize-no-action-time.patch} |   0
 ...int.patch => 0268-optimize-waypoint.patch} |   2 +-
 ...tion.patch => 0269-Paw-optimization.patch} |   2 +-
 ...ig-fixClimbingBypassingCrammingRule.patch} |   2 +-
 ...71-Skip-inactive-entity-for-execute.patch} |   0
 ....patch => 0272-Optimise-getEntities.patch} |   0
 ...-298464.patch => 0273-fix-MC-298464.patch} |   0
 ...stHomeAsWalkTarget-s-poi-finding-to.patch} |   0
 ...75-optimize-checkInsideBlocks-calls.patch} |   2 +-
 ...{0277-Op-lock.patch => 0276-Op-lock.patch} |   0
 .../features/0063-cache-profile-data.patch    | 146 ++++++++++++++++++
 .../leaf/config/modules/misc/Cache.java       |  29 ----
 .../modules/misc/CacheProfileLookup.java      |  31 ++++
 147 files changed, 202 insertions(+), 151 deletions(-)
 delete mode 100644 leaf-server/minecraft-patches/features/0134-Cache-player-profileResult.patch
 rename leaf-server/minecraft-patches/features/{0135-Matter-Secure-Seed.patch => 0134-Matter-Secure-Seed.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0136-Matter-Secure-Seed-command.patch => 0135-Matter-Secure-Seed-command.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0137-Faster-random-generator.patch => 0136-Faster-random-generator.patch} (99%)
 rename leaf-server/minecraft-patches/features/{0138-Don-t-save-primed-tnt-entity.patch => 0137-Don-t-save-primed-tnt-entity.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0139-Don-t-save-falling-block-entity.patch => 0138-Don-t-save-falling-block-entity.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0140-Configurable-connection-message.patch => 0139-Configurable-connection-message.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0141-Configurable-unknown-command-message.patch => 0140-Configurable-unknown-command-message.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0142-Remove-stream-in-BlockBehaviour-cache-blockstate.patch => 0141-Remove-stream-in-BlockBehaviour-cache-blockstate.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0143-Remove-stream-in-entity-visible-effects-filter.patch => 0142-Remove-stream-in-entity-visible-effects-filter.patch} (93%)
 rename leaf-server/minecraft-patches/features/{0144-Remove-stream-and-double-iteration-in-enough-deep-sl.patch => 0143-Remove-stream-and-double-iteration-in-enough-deep-sl.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0145-Remove-stream-in-trial-spawner-ticking.patch => 0144-Remove-stream-in-trial-spawner-ticking.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0146-Remove-stream-in-Brain.patch => 0145-Remove-stream-in-Brain.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0147-Remove-stream-in-BehaviorUtils.patch => 0146-Remove-stream-in-BehaviorUtils.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0148-Remove-stream-in-YieldJobSite.patch => 0147-Remove-stream-in-YieldJobSite.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0149-Remove-stream-in-PlayerSensor.patch => 0148-Remove-stream-in-PlayerSensor.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0150-Remove-stream-in-GolemSensor.patch => 0149-Remove-stream-in-GolemSensor.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0151-Remove-stream-in-GateBehavior.patch => 0150-Remove-stream-in-GateBehavior.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0152-Remove-stream-in-matchingSlot.patch => 0151-Remove-stream-in-matchingSlot.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0153-Remove-stream-in-entity-mountedOrDismounted-changes-.patch => 0152-Remove-stream-in-entity-mountedOrDismounted-changes-.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0154-Replace-Entity-active-effects-map-with-optimized-col.patch => 0153-Replace-Entity-active-effects-map-with-optimized-col.patch} (96%)
 rename leaf-server/minecraft-patches/features/{0155-Replace-criterion-map-with-optimized-collection.patch => 0154-Replace-criterion-map-with-optimized-collection.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0156-Replace-brain-with-optimized-collection.patch => 0155-Replace-brain-with-optimized-collection.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0157-Reduce-worldgen-allocations.patch => 0156-Reduce-worldgen-allocations.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0158-Use-caffeine-cache-for-kickPermission-instead-of-usi.patch => 0157-Use-caffeine-cache-for-kickPermission-instead-of-usi.patch} (97%)
 rename leaf-server/minecraft-patches/features/{0159-Do-not-place-player-if-the-server-is-full.patch => 0158-Do-not-place-player-if-the-server-is-full.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0160-Fix-MC-65198.patch => 0159-Fix-MC-65198.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0161-Fix-MC-200418.patch => 0160-Fix-MC-200418.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0162-Fix-MC-119417.patch => 0161-Fix-MC-119417.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0163-Fix-MC-223153.patch => 0162-Fix-MC-223153.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0164-Configurable-player-knockback-zombie.patch => 0163-Configurable-player-knockback-zombie.patch} (95%)
 rename leaf-server/minecraft-patches/features/{0165-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch => 0164-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0166-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch => 0165-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0167-PaperPR-Fix-some-beacon-event-issues.patch => 0166-PaperPR-Fix-some-beacon-event-issues.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0168-Dont-send-useless-entity-packets.patch => 0167-Dont-send-useless-entity-packets.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0169-Multithreaded-Tracker.patch => 0168-Multithreaded-Tracker.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0170-Nitori-Async-playerdata-saving.patch => 0169-Nitori-Async-playerdata-saving.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0171-Optimize-nearby-alive-players-for-spawning.patch => 0170-Optimize-nearby-alive-players-for-spawning.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0172-Cache-blockstate-cache-array.patch => 0171-Cache-blockstate-cache-array.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0173-Asynchronous-locator.patch => 0172-Asynchronous-locator.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0174-Smart-sort-entities-in-NearestLivingEntitySensor.patch => 0173-Smart-sort-entities-in-NearestLivingEntitySensor.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0175-Further-reduce-memory-footprint-of-CompoundTag.patch => 0174-Further-reduce-memory-footprint-of-CompoundTag.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0176-Optimize-Entity-distanceToSqr.patch => 0175-Optimize-Entity-distanceToSqr.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0177-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch => 0176-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0178-Cache-tile-entity-position.patch => 0177-Cache-tile-entity-position.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0179-TT20-Lag-compensation.patch => 0178-TT20-Lag-compensation.patch} (97%)
 rename leaf-server/minecraft-patches/features/{0180-C2ME-Reduce-Allocations.patch => 0179-C2ME-Reduce-Allocations.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0181-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch => 0180-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch} (94%)
 rename leaf-server/minecraft-patches/features/{0182-Lithium-fast-util.patch => 0181-Lithium-fast-util.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0183-Lithium-cached-iterate-outwards.patch => 0182-Lithium-cached-iterate-outwards.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0184-Use-faster-and-thread-safe-ban-list-date-format-pars.patch => 0183-Use-faster-and-thread-safe-ban-list-date-format-pars.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0185-C2ME-Optimize-world-gen-math.patch => 0184-C2ME-Optimize-world-gen-math.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0186-Cache-chunk-key.patch => 0185-Cache-chunk-key.patch} (99%)
 rename leaf-server/minecraft-patches/features/{0187-Cache-random-tick-block-status.patch => 0186-Cache-random-tick-block-status.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0188-Cache-part-of-canHoldFluid-result.patch => 0187-Cache-part-of-canHoldFluid-result.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0189-Configurable-tripwire-dupe.patch => 0188-Configurable-tripwire-dupe.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0190-PaperPR-Fix-MC-117075-Block-Entities-Unload-Lag-Spik.patch => 0189-PaperPR-Fix-MC-117075-Block-Entities-Unload-Lag-Spik.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0191-Sepals-Rearrange-the-attackable-conditions.patch => 0190-Sepals-Rearrange-the-attackable-conditions.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0192-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch => 0191-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0193-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch => 0192-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch} (92%)
 rename leaf-server/minecraft-patches/features/{0194-Optimize-checking-nearby-players-for-spawning.patch => 0193-Optimize-checking-nearby-players-for-spawning.patch} (97%)
 rename leaf-server/minecraft-patches/features/{0195-Cache-supporting-block-check.patch => 0194-Cache-supporting-block-check.patch} (96%)
 rename leaf-server/minecraft-patches/features/{0196-Avoid-useless-deque-clear-on-LevelTicks-cleanupAfter.patch => 0195-Avoid-useless-deque-clear-on-LevelTicks-cleanupAfter.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0197-Remove-stream-in-villagers.patch => 0196-Remove-stream-in-villagers.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0198-Optimize-baby-villager-sensor.patch => 0197-Optimize-baby-villager-sensor.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0199-Only-player-pushable.patch => 0198-Only-player-pushable.patch} (98%)
 rename leaf-server/minecraft-patches/features/{0200-Remove-iterators-from-Inventory.patch => 0199-Remove-iterators-from-Inventory.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0201-optimize-mob-despawn.patch => 0200-optimize-mob-despawn.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0202-Slightly-optimise-getNearestPlayer.patch => 0201-Slightly-optimise-getNearestPlayer.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0203-Bulk-writes-to-writeLongArray-during-chunk-loading.patch => 0202-Bulk-writes-to-writeLongArray-during-chunk-loading.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0204-Improve-sorting-in-SortedArraySet.patch => 0203-Improve-sorting-in-SortedArraySet.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0205-Make-removeIf-slightly-faster.patch => 0204-Make-removeIf-slightly-faster.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0206-Optimize-LinearPalette.patch => 0205-Optimize-LinearPalette.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0207-Slightly-optimized-VarInt-write.patch => 0206-Slightly-optimized-VarInt-write.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0208-Rewrite-ClientboundLightUpdatePacketData.patch => 0207-Rewrite-ClientboundLightUpdatePacketData.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0209-Async-chunk-sending.patch => 0208-Async-chunk-sending.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0210-Spawner-Configurations.patch => 0209-Spawner-Configurations.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0211-SparklyPaper-Parallel-world-ticking.patch => 0210-SparklyPaper-Parallel-world-ticking.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0212-SparklyPaper-Track-each-world-MSPT.patch => 0211-SparklyPaper-Track-each-world-MSPT.patch} (98%)
 rename leaf-server/minecraft-patches/features/{0213-PaperPR-Fix-cancelled-Projectile-Events-still-consum.patch => 0212-PaperPR-Fix-cancelled-Projectile-Events-still-consum.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0214-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch => 0213-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0215-rewrite-InsideBrownianWalk.patch => 0214-rewrite-InsideBrownianWalk.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0216-Use-BFS-on-getSlopeDistance.patch => 0215-Use-BFS-on-getSlopeDistance.patch} (98%)
 rename leaf-server/minecraft-patches/features/{0217-Paper-PR-Throttle-failed-spawn-attempts.patch => 0216-Paper-PR-Throttle-failed-spawn-attempts.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0218-Improve-BlockEntity-ticking-isRemoved-check.patch => 0217-Improve-BlockEntity-ticking-isRemoved-check.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0219-Raytrace-AntiXray-SDK-integration.patch => 0218-Raytrace-AntiXray-SDK-integration.patch} (96%)
 rename leaf-server/minecraft-patches/features/{0220-Optimize-addOrUpdateTransientModifier.patch => 0219-Optimize-addOrUpdateTransientModifier.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0221-Optimize-ContextMap.create.patch => 0220-Optimize-ContextMap.create.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0222-Micro-optimizations-for-random-tick.patch => 0221-Micro-optimizations-for-random-tick.patch} (97%)
 rename leaf-server/minecraft-patches/features/{0223-Remove-streams-on-updateConnectedPlayersWithinRange.patch => 0222-Remove-streams-on-updateConnectedPlayersWithinRange.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0224-Remove-streams-on-PlayerDetector.patch => 0223-Remove-streams-on-PlayerDetector.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0225-Use-direct-iteration-on-Sensing.tick.patch => 0224-Use-direct-iteration-on-Sensing.tick.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0226-Optimise-non-flush-packet-sending.patch => 0225-Optimise-non-flush-packet-sending.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0227-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch => 0226-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch} (96%)
 rename leaf-server/minecraft-patches/features/{0228-Null-handling-on-MultifaceSpreader.patch => 0227-Null-handling-on-MultifaceSpreader.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0229-More-virtual-threads.patch => 0228-More-virtual-threads.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0230-Async-target-finding.patch => 0229-Async-target-finding.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0231-Optimize-ThreadedTicketLevelPropagator.patch => 0230-Optimize-ThreadedTicketLevelPropagator.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0232-Optimise-MobEffectUtil-getDigSpeedAmplification.patch => 0231-Optimise-MobEffectUtil-getDigSpeedAmplification.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0233-Optimise-chunkUnloads.patch => 0232-Optimise-chunkUnloads.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0234-Optimize-BlockEntityType-isValid.patch => 0233-Optimize-BlockEntityType-isValid.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0235-PaperPR-Add-ticket-on-player-join-to-avoid-chunk-loa.patch => 0234-PaperPR-Add-ticket-on-player-join-to-avoid-chunk-loa.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0236-Sakura-copy-EntityList-implementation-to-BasicEntity.patch => 0235-Sakura-copy-EntityList-implementation-to-BasicEntity.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0237-Protocol-Core.patch => 0236-Protocol-Core.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0238-Async-switch-connection-state.patch => 0237-Async-switch-connection-state.patch} (98%)
 rename leaf-server/minecraft-patches/features/{0239-Optimize-BlockEntities-tickersInLevel.patch => 0238-Optimize-BlockEntities-tickersInLevel.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0240-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch => 0239-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0241-Flush-location-while-knockback.patch => 0240-Flush-location-while-knockback.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0242-Only-tick-items-at-hand.patch => 0241-Only-tick-items-at-hand.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0243-Smart-sort-items-in-NearestItemSensor.patch => 0242-Smart-sort-items-in-NearestItemSensor.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0244-Optimise-player-movement-checks.patch => 0243-Optimise-player-movement-checks.patch} (90%)
 rename leaf-server/minecraft-patches/features/{0245-Remove-streams-in-MobSensor.patch => 0244-Remove-streams-in-MobSensor.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0246-Remove-streams-in-TemptingSensor.patch => 0245-Remove-streams-in-TemptingSensor.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0247-Use-HashedList-on-WeightedList.patch => 0246-Use-HashedList-on-WeightedList.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0248-Add-configurable-death-item-drop-knockback-settings.patch => 0247-Add-configurable-death-item-drop-knockback-settings.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0249-Optimize-getScaledTrackingDistance.patch => 0248-Optimize-getScaledTrackingDistance.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0250-Optimize-SynchedEntityData-packDirty.patch => 0249-Optimize-SynchedEntityData-packDirty.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0251-Optimize-isEyeInFluid.patch => 0250-Optimize-isEyeInFluid.patch} (99%)
 rename leaf-server/minecraft-patches/features/{0252-Cache-block-path-type.patch => 0251-Cache-block-path-type.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0253-optimize-getEntityStatus.patch => 0252-optimize-getEntityStatus.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0254-Rail-Optimization-optimized-PoweredRailBlock-logic.patch => 0253-Rail-Optimization-optimized-PoweredRailBlock-logic.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0255-optimise-ChunkGenerator-getMobsAt.patch => 0254-optimise-ChunkGenerator-getMobsAt.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0256-cache-getBiome.patch => 0255-cache-getBiome.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0257-optimize-mob-spawning.patch => 0256-optimize-mob-spawning.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0258-optimize-structure-map.patch => 0257-optimize-structure-map.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0259-throttle-mob-spawning.patch => 0258-throttle-mob-spawning.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0260-Add-BlockExplosionHitEvent.patch => 0259-Add-BlockExplosionHitEvent.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0261-Old-Blast-Protection-explosion-knockback.patch => 0260-Old-Blast-Protection-explosion-knockback.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0262-Use-UUID-for-cure-reputation.patch => 0261-Use-UUID-for-cure-reputation.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0263-Fix-crash-during-parsing-unknown-command-message.patch => 0262-Fix-crash-during-parsing-unknown-command-message.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0264-optimize-random-tick.patch => 0263-optimize-random-tick.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0265-do-not-log-invalid-flatten-text-component-parse.patch => 0264-do-not-log-invalid-flatten-text-component-parse.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0266-Fast-BiomeManager-seed-obfuscation.patch => 0265-Fast-BiomeManager-seed-obfuscation.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0267-Replace-EntitySelectorOptions-map-with-optimized-col.patch => 0266-Replace-EntitySelectorOptions-map-with-optimized-col.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0268-optimize-no-action-time.patch => 0267-optimize-no-action-time.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0269-optimize-waypoint.patch => 0268-optimize-waypoint.patch} (96%)
 rename leaf-server/minecraft-patches/features/{0270-Paw-optimization.patch => 0269-Paw-optimization.patch} (99%)
 rename leaf-server/minecraft-patches/features/{0271-Fix-Paper-config-fixClimbingBypassingCrammingRule.patch => 0270-Fix-Paper-config-fixClimbingBypassingCrammingRule.patch} (95%)
 rename leaf-server/minecraft-patches/features/{0272-Skip-inactive-entity-for-execute.patch => 0271-Skip-inactive-entity-for-execute.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0273-Optimise-getEntities.patch => 0272-Optimise-getEntities.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0274-fix-MC-298464.patch => 0273-fix-MC-298464.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0275-Re-route-SetClosestHomeAsWalkTarget-s-poi-finding-to.patch => 0274-Re-route-SetClosestHomeAsWalkTarget-s-poi-finding-to.patch} (100%)
 rename leaf-server/minecraft-patches/features/{0276-optimize-checkInsideBlocks-calls.patch => 0275-optimize-checkInsideBlocks-calls.patch} (99%)
 rename leaf-server/minecraft-patches/features/{0277-Op-lock.patch => 0276-Op-lock.patch} (100%)
 create mode 100644 leaf-server/paper-patches/features/0063-cache-profile-data.patch
 delete mode 100644 leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/Cache.java
 create mode 100644 leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/CacheProfileLookup.java

diff --git a/leaf-server/minecraft-patches/features/0134-Cache-player-profileResult.patch b/leaf-server/minecraft-patches/features/0134-Cache-player-profileResult.patch
deleted file mode 100644
index 8d2fd25c..00000000
--- a/leaf-server/minecraft-patches/features/0134-Cache-player-profileResult.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
-Date: Thu, 28 Mar 2024 13:36:09 -0400
-Subject: [PATCH] Cache player profileResult
-
-This patch includes code that references the Caffeine caching library,
-which is licensed under the Apache License, Version 2.0.
-
-Caffeine (https://github.com/ben-manes/caffeine)
-Copyright (c) Ben Manes
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-diff --git a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index f68923c5f6fbecd8f1c10a30dbd06ed0dfee8b84..2e014cd543a6a790a0023835199b0e956e49fd1f 100644
---- a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-+++ b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -71,6 +71,14 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
-     public @Nullable java.util.UUID requestedUuid; // Paper
-     private final io.papermc.paper.connection.PaperPlayerLoginConnection paperLoginConnection; // Paper - Config API
-     private volatile boolean disconnecting = false; // Paper - Fix disconnect still ticking login
-+    // Leaf start - Cache player profileResult
-+    private static final com.github.benmanes.caffeine.cache.Cache<String, ProfileResult> playerProfileResultCache = com.github.benmanes.caffeine.cache.Caffeine.newBuilder()
-+        .expireAfterWrite(org.dreeam.leaf.config.modules.misc.Cache.cachePlayerProfileResultTimeout, java.util.concurrent.TimeUnit.MINUTES)
-+        .build();
-+    private static final com.github.benmanes.caffeine.cache.Cache<String, InetAddress> playerSession = com.github.benmanes.caffeine.cache.Caffeine.newBuilder()
-+        .expireAfterWrite(org.dreeam.leaf.config.modules.misc.Cache.cachePlayerProfileResultTimeout, java.util.concurrent.TimeUnit.MINUTES)
-+        .build();
-+    // Leaf end - Cache player profileResult
- 
-     public ServerLoginPacketListenerImpl(MinecraftServer server, Connection connection, boolean transferred) {
-         this.server = server;
-@@ -269,9 +277,30 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
-                 String string1 = Objects.requireNonNull(ServerLoginPacketListenerImpl.this.requestedUsername, "Player name not initialized");
- 
-                 try {
--                    ProfileResult profileResult = ServerLoginPacketListenerImpl.this.server
--                        .getSessionService()
--                        .hasJoinedServer(string1, string, this.getAddress());
-+                    // Leaf start - Cache player profileResult
-+                    ProfileResult profileResult;
-+                    if (org.dreeam.leaf.config.modules.misc.Cache.cachePlayerProfileResult) {
-+                        profileResult = playerProfileResultCache.getIfPresent(string1);
-+
-+                        InetAddress address = this.getAddress();
-+                        InetAddress lastAddress = playerSession.getIfPresent(string1);
-+                        if (isInvalidSession(address, lastAddress)) {
-+                            // Send request to mojang server to verify session
-+                            // Result will be null if is invalid and will do disconnect logic below
-+                            profileResult = ServerLoginPacketListenerImpl.this.server
-+                                .getSessionService()
-+                                .hasJoinedServer(string1, string, address);
-+                            if (profileResult != null && address != null) {
-+                                playerProfileResultCache.put(string1, profileResult);
-+                                playerSession.put(string1, address);
-+                            }
-+                        }
-+                    } else {
-+                        profileResult = ServerLoginPacketListenerImpl.this.server
-+                            .getSessionService()
-+                            .hasJoinedServer(string1, string, this.getAddress());
-+                    }
-+                    // Leaf end - Cache player profileResult
-                     if (profileResult != null) {
-                         GameProfile gameProfile = profileResult.profile();
-                         // CraftBukkit start - fire PlayerPreLoginEvent
-@@ -316,6 +345,20 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
-         // Paper end - Cache authenticator threads
-     }
- 
-+    // Leaf start - Cache player profileResult
-+    private static boolean isInvalidSession(@org.jetbrains.annotations.Nullable InetAddress currAddress, @org.jetbrains.annotations.Nullable InetAddress lastAddress) {
-+        // Invalid address or non-public IP address
-+        if (currAddress == null ||
-+            currAddress.isAnyLocalAddress() ||
-+            currAddress.isLinkLocalAddress() ||
-+            currAddress.isLoopbackAddress() ||
-+            currAddress.isSiteLocalAddress()) {
-+            return true;
-+        }
-+        return !currAddress.equals(lastAddress);
-+    }
-+    // Leaf end - Cache player profileResult
-+
-     // CraftBukkit start
-     private GameProfile callPlayerPreLoginEvents(GameProfile gameprofile) throws Exception { // Paper - Add more fields to AsyncPlayerPreLoginEvent
-         // Paper start - Add Velocity IP Forwarding Support
diff --git a/leaf-server/minecraft-patches/features/0135-Matter-Secure-Seed.patch b/leaf-server/minecraft-patches/features/0134-Matter-Secure-Seed.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0135-Matter-Secure-Seed.patch
rename to leaf-server/minecraft-patches/features/0134-Matter-Secure-Seed.patch
diff --git a/leaf-server/minecraft-patches/features/0136-Matter-Secure-Seed-command.patch b/leaf-server/minecraft-patches/features/0135-Matter-Secure-Seed-command.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0136-Matter-Secure-Seed-command.patch
rename to leaf-server/minecraft-patches/features/0135-Matter-Secure-Seed-command.patch
diff --git a/leaf-server/minecraft-patches/features/0137-Faster-random-generator.patch b/leaf-server/minecraft-patches/features/0136-Faster-random-generator.patch
similarity index 99%
rename from leaf-server/minecraft-patches/features/0137-Faster-random-generator.patch
rename to leaf-server/minecraft-patches/features/0136-Faster-random-generator.patch
index 4818423e..814f40a2 100644
--- a/leaf-server/minecraft-patches/features/0137-Faster-random-generator.patch
+++ b/leaf-server/minecraft-patches/features/0136-Faster-random-generator.patch
@@ -97,7 +97,7 @@ index 8516d47b0ba79d91638837199e7ae0fb6cb44a79..4f4b55dd099dd2c2fea118b18b535881
      RandomSource fork();
  
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 0cdd3eb97e74aa3955f014a1f8f6a7d1580d323f..574be7359a2ad62c95a42c46c7a0f3c7a42eb44e 100644
+index ce331618d70d3dcfa576994e3f67f8c81fd6e8cc..2bed05da7e5ba52e85d437460679a7b81293fe5b 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -155,7 +155,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/leaf-server/minecraft-patches/features/0138-Don-t-save-primed-tnt-entity.patch b/leaf-server/minecraft-patches/features/0137-Don-t-save-primed-tnt-entity.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0138-Don-t-save-primed-tnt-entity.patch
rename to leaf-server/minecraft-patches/features/0137-Don-t-save-primed-tnt-entity.patch
diff --git a/leaf-server/minecraft-patches/features/0139-Don-t-save-falling-block-entity.patch b/leaf-server/minecraft-patches/features/0138-Don-t-save-falling-block-entity.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0139-Don-t-save-falling-block-entity.patch
rename to leaf-server/minecraft-patches/features/0138-Don-t-save-falling-block-entity.patch
diff --git a/leaf-server/minecraft-patches/features/0140-Configurable-connection-message.patch b/leaf-server/minecraft-patches/features/0139-Configurable-connection-message.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0140-Configurable-connection-message.patch
rename to leaf-server/minecraft-patches/features/0139-Configurable-connection-message.patch
diff --git a/leaf-server/minecraft-patches/features/0141-Configurable-unknown-command-message.patch b/leaf-server/minecraft-patches/features/0140-Configurable-unknown-command-message.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0141-Configurable-unknown-command-message.patch
rename to leaf-server/minecraft-patches/features/0140-Configurable-unknown-command-message.patch
diff --git a/leaf-server/minecraft-patches/features/0142-Remove-stream-in-BlockBehaviour-cache-blockstate.patch b/leaf-server/minecraft-patches/features/0141-Remove-stream-in-BlockBehaviour-cache-blockstate.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0142-Remove-stream-in-BlockBehaviour-cache-blockstate.patch
rename to leaf-server/minecraft-patches/features/0141-Remove-stream-in-BlockBehaviour-cache-blockstate.patch
diff --git a/leaf-server/minecraft-patches/features/0143-Remove-stream-in-entity-visible-effects-filter.patch b/leaf-server/minecraft-patches/features/0142-Remove-stream-in-entity-visible-effects-filter.patch
similarity index 93%
rename from leaf-server/minecraft-patches/features/0143-Remove-stream-in-entity-visible-effects-filter.patch
rename to leaf-server/minecraft-patches/features/0142-Remove-stream-in-entity-visible-effects-filter.patch
index 238af3b2..9e499c74 100644
--- a/leaf-server/minecraft-patches/features/0143-Remove-stream-in-entity-visible-effects-filter.patch
+++ b/leaf-server/minecraft-patches/features/0142-Remove-stream-in-entity-visible-effects-filter.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove stream in entity visible effects filter
 
 
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 34460363c4a5fbd274fee0f26d3731333c990072..df52963414f6c3b626eaed0f36a6cabdad68f398 100644
+index d8c3f05d36916e122bfd47d761b4d91ab54fd8f5..a75f8f86ebd3bb73b5fbeb389137344256e1175f 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -1013,12 +1013,15 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
diff --git a/leaf-server/minecraft-patches/features/0144-Remove-stream-and-double-iteration-in-enough-deep-sl.patch b/leaf-server/minecraft-patches/features/0143-Remove-stream-and-double-iteration-in-enough-deep-sl.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0144-Remove-stream-and-double-iteration-in-enough-deep-sl.patch
rename to leaf-server/minecraft-patches/features/0143-Remove-stream-and-double-iteration-in-enough-deep-sl.patch
diff --git a/leaf-server/minecraft-patches/features/0145-Remove-stream-in-trial-spawner-ticking.patch b/leaf-server/minecraft-patches/features/0144-Remove-stream-in-trial-spawner-ticking.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0145-Remove-stream-in-trial-spawner-ticking.patch
rename to leaf-server/minecraft-patches/features/0144-Remove-stream-in-trial-spawner-ticking.patch
diff --git a/leaf-server/minecraft-patches/features/0146-Remove-stream-in-Brain.patch b/leaf-server/minecraft-patches/features/0145-Remove-stream-in-Brain.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0146-Remove-stream-in-Brain.patch
rename to leaf-server/minecraft-patches/features/0145-Remove-stream-in-Brain.patch
diff --git a/leaf-server/minecraft-patches/features/0147-Remove-stream-in-BehaviorUtils.patch b/leaf-server/minecraft-patches/features/0146-Remove-stream-in-BehaviorUtils.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0147-Remove-stream-in-BehaviorUtils.patch
rename to leaf-server/minecraft-patches/features/0146-Remove-stream-in-BehaviorUtils.patch
diff --git a/leaf-server/minecraft-patches/features/0148-Remove-stream-in-YieldJobSite.patch b/leaf-server/minecraft-patches/features/0147-Remove-stream-in-YieldJobSite.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0148-Remove-stream-in-YieldJobSite.patch
rename to leaf-server/minecraft-patches/features/0147-Remove-stream-in-YieldJobSite.patch
diff --git a/leaf-server/minecraft-patches/features/0149-Remove-stream-in-PlayerSensor.patch b/leaf-server/minecraft-patches/features/0148-Remove-stream-in-PlayerSensor.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0149-Remove-stream-in-PlayerSensor.patch
rename to leaf-server/minecraft-patches/features/0148-Remove-stream-in-PlayerSensor.patch
diff --git a/leaf-server/minecraft-patches/features/0150-Remove-stream-in-GolemSensor.patch b/leaf-server/minecraft-patches/features/0149-Remove-stream-in-GolemSensor.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0150-Remove-stream-in-GolemSensor.patch
rename to leaf-server/minecraft-patches/features/0149-Remove-stream-in-GolemSensor.patch
diff --git a/leaf-server/minecraft-patches/features/0151-Remove-stream-in-GateBehavior.patch b/leaf-server/minecraft-patches/features/0150-Remove-stream-in-GateBehavior.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0151-Remove-stream-in-GateBehavior.patch
rename to leaf-server/minecraft-patches/features/0150-Remove-stream-in-GateBehavior.patch
diff --git a/leaf-server/minecraft-patches/features/0152-Remove-stream-in-matchingSlot.patch b/leaf-server/minecraft-patches/features/0151-Remove-stream-in-matchingSlot.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0152-Remove-stream-in-matchingSlot.patch
rename to leaf-server/minecraft-patches/features/0151-Remove-stream-in-matchingSlot.patch
diff --git a/leaf-server/minecraft-patches/features/0153-Remove-stream-in-entity-mountedOrDismounted-changes-.patch b/leaf-server/minecraft-patches/features/0152-Remove-stream-in-entity-mountedOrDismounted-changes-.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0153-Remove-stream-in-entity-mountedOrDismounted-changes-.patch
rename to leaf-server/minecraft-patches/features/0152-Remove-stream-in-entity-mountedOrDismounted-changes-.patch
diff --git a/leaf-server/minecraft-patches/features/0154-Replace-Entity-active-effects-map-with-optimized-col.patch b/leaf-server/minecraft-patches/features/0153-Replace-Entity-active-effects-map-with-optimized-col.patch
similarity index 96%
rename from leaf-server/minecraft-patches/features/0154-Replace-Entity-active-effects-map-with-optimized-col.patch
rename to leaf-server/minecraft-patches/features/0153-Replace-Entity-active-effects-map-with-optimized-col.patch
index 5fcbf028..d9affe7b 100644
--- a/leaf-server/minecraft-patches/features/0154-Replace-Entity-active-effects-map-with-optimized-col.patch
+++ b/leaf-server/minecraft-patches/features/0153-Replace-Entity-active-effects-map-with-optimized-col.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Replace Entity active effects map with optimized collection
 Dreeam TODO: check this
 
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index df52963414f6c3b626eaed0f36a6cabdad68f398..4fc9b64bce70ef1169cf361d1414553f63f047ec 100644
+index a75f8f86ebd3bb73b5fbeb389137344256e1175f..1df69848c60a724b14bb6230a67ecd7cac1a0e03 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -208,6 +208,10 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
diff --git a/leaf-server/minecraft-patches/features/0155-Replace-criterion-map-with-optimized-collection.patch b/leaf-server/minecraft-patches/features/0154-Replace-criterion-map-with-optimized-collection.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0155-Replace-criterion-map-with-optimized-collection.patch
rename to leaf-server/minecraft-patches/features/0154-Replace-criterion-map-with-optimized-collection.patch
diff --git a/leaf-server/minecraft-patches/features/0156-Replace-brain-with-optimized-collection.patch b/leaf-server/minecraft-patches/features/0155-Replace-brain-with-optimized-collection.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0156-Replace-brain-with-optimized-collection.patch
rename to leaf-server/minecraft-patches/features/0155-Replace-brain-with-optimized-collection.patch
diff --git a/leaf-server/minecraft-patches/features/0157-Reduce-worldgen-allocations.patch b/leaf-server/minecraft-patches/features/0156-Reduce-worldgen-allocations.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0157-Reduce-worldgen-allocations.patch
rename to leaf-server/minecraft-patches/features/0156-Reduce-worldgen-allocations.patch
diff --git a/leaf-server/minecraft-patches/features/0158-Use-caffeine-cache-for-kickPermission-instead-of-usi.patch b/leaf-server/minecraft-patches/features/0157-Use-caffeine-cache-for-kickPermission-instead-of-usi.patch
similarity index 97%
rename from leaf-server/minecraft-patches/features/0158-Use-caffeine-cache-for-kickPermission-instead-of-usi.patch
rename to leaf-server/minecraft-patches/features/0157-Use-caffeine-cache-for-kickPermission-instead-of-usi.patch
index b6585b19..a75566aa 100644
--- a/leaf-server/minecraft-patches/features/0158-Use-caffeine-cache-for-kickPermission-instead-of-usi.patch
+++ b/leaf-server/minecraft-patches/features/0157-Use-caffeine-cache-for-kickPermission-instead-of-usi.patch
@@ -23,7 +23,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b3c138e78552ba348d67c37343c6684d37f2e10f..3f8b0c9f0d2172b1ffaee6c1065a91ff34b35953 100644
+index 0c73d4919e58b9282a8a6fc24fc7ab8e87b97b74..070fc3b4ec0558c597eb411db5b22edc447fe976 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -342,17 +342,12 @@ public class ServerGamePacketListenerImpl
diff --git a/leaf-server/minecraft-patches/features/0159-Do-not-place-player-if-the-server-is-full.patch b/leaf-server/minecraft-patches/features/0158-Do-not-place-player-if-the-server-is-full.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0159-Do-not-place-player-if-the-server-is-full.patch
rename to leaf-server/minecraft-patches/features/0158-Do-not-place-player-if-the-server-is-full.patch
diff --git a/leaf-server/minecraft-patches/features/0160-Fix-MC-65198.patch b/leaf-server/minecraft-patches/features/0159-Fix-MC-65198.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0160-Fix-MC-65198.patch
rename to leaf-server/minecraft-patches/features/0159-Fix-MC-65198.patch
diff --git a/leaf-server/minecraft-patches/features/0161-Fix-MC-200418.patch b/leaf-server/minecraft-patches/features/0160-Fix-MC-200418.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0161-Fix-MC-200418.patch
rename to leaf-server/minecraft-patches/features/0160-Fix-MC-200418.patch
diff --git a/leaf-server/minecraft-patches/features/0162-Fix-MC-119417.patch b/leaf-server/minecraft-patches/features/0161-Fix-MC-119417.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0162-Fix-MC-119417.patch
rename to leaf-server/minecraft-patches/features/0161-Fix-MC-119417.patch
diff --git a/leaf-server/minecraft-patches/features/0163-Fix-MC-223153.patch b/leaf-server/minecraft-patches/features/0162-Fix-MC-223153.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0163-Fix-MC-223153.patch
rename to leaf-server/minecraft-patches/features/0162-Fix-MC-223153.patch
diff --git a/leaf-server/minecraft-patches/features/0164-Configurable-player-knockback-zombie.patch b/leaf-server/minecraft-patches/features/0163-Configurable-player-knockback-zombie.patch
similarity index 95%
rename from leaf-server/minecraft-patches/features/0164-Configurable-player-knockback-zombie.patch
rename to leaf-server/minecraft-patches/features/0163-Configurable-player-knockback-zombie.patch
index 25a2b11c..e7c18f07 100644
--- a/leaf-server/minecraft-patches/features/0164-Configurable-player-knockback-zombie.patch
+++ b/leaf-server/minecraft-patches/features/0163-Configurable-player-knockback-zombie.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable player knockback zombie
 
 
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 4fc9b64bce70ef1169cf361d1414553f63f047ec..d81d1303fc3d23b35dbc177dd6a4c7f489eb5381 100644
+index 1df69848c60a724b14bb6230a67ecd7cac1a0e03..f63d0af0f6dc8a634f56f329d256affeaeac17da 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -2111,6 +2111,8 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
diff --git a/leaf-server/minecraft-patches/features/0165-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch b/leaf-server/minecraft-patches/features/0164-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0165-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch
rename to leaf-server/minecraft-patches/features/0164-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch
diff --git a/leaf-server/minecraft-patches/features/0166-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch b/leaf-server/minecraft-patches/features/0165-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0166-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch
rename to leaf-server/minecraft-patches/features/0165-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch
diff --git a/leaf-server/minecraft-patches/features/0167-PaperPR-Fix-some-beacon-event-issues.patch b/leaf-server/minecraft-patches/features/0166-PaperPR-Fix-some-beacon-event-issues.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0167-PaperPR-Fix-some-beacon-event-issues.patch
rename to leaf-server/minecraft-patches/features/0166-PaperPR-Fix-some-beacon-event-issues.patch
diff --git a/leaf-server/minecraft-patches/features/0168-Dont-send-useless-entity-packets.patch b/leaf-server/minecraft-patches/features/0167-Dont-send-useless-entity-packets.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0168-Dont-send-useless-entity-packets.patch
rename to leaf-server/minecraft-patches/features/0167-Dont-send-useless-entity-packets.patch
diff --git a/leaf-server/minecraft-patches/features/0169-Multithreaded-Tracker.patch b/leaf-server/minecraft-patches/features/0168-Multithreaded-Tracker.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0169-Multithreaded-Tracker.patch
rename to leaf-server/minecraft-patches/features/0168-Multithreaded-Tracker.patch
diff --git a/leaf-server/minecraft-patches/features/0170-Nitori-Async-playerdata-saving.patch b/leaf-server/minecraft-patches/features/0169-Nitori-Async-playerdata-saving.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0170-Nitori-Async-playerdata-saving.patch
rename to leaf-server/minecraft-patches/features/0169-Nitori-Async-playerdata-saving.patch
diff --git a/leaf-server/minecraft-patches/features/0171-Optimize-nearby-alive-players-for-spawning.patch b/leaf-server/minecraft-patches/features/0170-Optimize-nearby-alive-players-for-spawning.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0171-Optimize-nearby-alive-players-for-spawning.patch
rename to leaf-server/minecraft-patches/features/0170-Optimize-nearby-alive-players-for-spawning.patch
diff --git a/leaf-server/minecraft-patches/features/0172-Cache-blockstate-cache-array.patch b/leaf-server/minecraft-patches/features/0171-Cache-blockstate-cache-array.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0172-Cache-blockstate-cache-array.patch
rename to leaf-server/minecraft-patches/features/0171-Cache-blockstate-cache-array.patch
diff --git a/leaf-server/minecraft-patches/features/0173-Asynchronous-locator.patch b/leaf-server/minecraft-patches/features/0172-Asynchronous-locator.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0173-Asynchronous-locator.patch
rename to leaf-server/minecraft-patches/features/0172-Asynchronous-locator.patch
diff --git a/leaf-server/minecraft-patches/features/0174-Smart-sort-entities-in-NearestLivingEntitySensor.patch b/leaf-server/minecraft-patches/features/0173-Smart-sort-entities-in-NearestLivingEntitySensor.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0174-Smart-sort-entities-in-NearestLivingEntitySensor.patch
rename to leaf-server/minecraft-patches/features/0173-Smart-sort-entities-in-NearestLivingEntitySensor.patch
diff --git a/leaf-server/minecraft-patches/features/0175-Further-reduce-memory-footprint-of-CompoundTag.patch b/leaf-server/minecraft-patches/features/0174-Further-reduce-memory-footprint-of-CompoundTag.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0175-Further-reduce-memory-footprint-of-CompoundTag.patch
rename to leaf-server/minecraft-patches/features/0174-Further-reduce-memory-footprint-of-CompoundTag.patch
diff --git a/leaf-server/minecraft-patches/features/0176-Optimize-Entity-distanceToSqr.patch b/leaf-server/minecraft-patches/features/0175-Optimize-Entity-distanceToSqr.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0176-Optimize-Entity-distanceToSqr.patch
rename to leaf-server/minecraft-patches/features/0175-Optimize-Entity-distanceToSqr.patch
diff --git a/leaf-server/minecraft-patches/features/0177-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch b/leaf-server/minecraft-patches/features/0176-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0177-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch
rename to leaf-server/minecraft-patches/features/0176-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch
diff --git a/leaf-server/minecraft-patches/features/0178-Cache-tile-entity-position.patch b/leaf-server/minecraft-patches/features/0177-Cache-tile-entity-position.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0178-Cache-tile-entity-position.patch
rename to leaf-server/minecraft-patches/features/0177-Cache-tile-entity-position.patch
diff --git a/leaf-server/minecraft-patches/features/0179-TT20-Lag-compensation.patch b/leaf-server/minecraft-patches/features/0178-TT20-Lag-compensation.patch
similarity index 97%
rename from leaf-server/minecraft-patches/features/0179-TT20-Lag-compensation.patch
rename to leaf-server/minecraft-patches/features/0178-TT20-Lag-compensation.patch
index f2c38fce..d825871e 100644
--- a/leaf-server/minecraft-patches/features/0179-TT20-Lag-compensation.patch
+++ b/leaf-server/minecraft-patches/features/0178-TT20-Lag-compensation.patch
@@ -7,7 +7,7 @@ Original license: AGPL-3.0
 Original project: https://github.com/snackbag/TT20
 
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 07943aa3be4222ab7a63b09a6625f7a003da8725..3c45e6eac0403c9cb13409c8e0e9c1653fd531ba 100644
+index 6c1a8925b1e13a0ebddc1b45a980fe8bdd8676cf..169d4c5e317af201a2d5ad0d82d39805376c2e9e 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -1541,6 +1541,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/leaf-server/minecraft-patches/features/0180-C2ME-Reduce-Allocations.patch b/leaf-server/minecraft-patches/features/0179-C2ME-Reduce-Allocations.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0180-C2ME-Reduce-Allocations.patch
rename to leaf-server/minecraft-patches/features/0179-C2ME-Reduce-Allocations.patch
diff --git a/leaf-server/minecraft-patches/features/0181-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch b/leaf-server/minecraft-patches/features/0180-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch
similarity index 94%
rename from leaf-server/minecraft-patches/features/0181-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch
rename to leaf-server/minecraft-patches/features/0180-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch
index b3c4f06c..632e0d3f 100644
--- a/leaf-server/minecraft-patches/features/0181-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch
+++ b/leaf-server/minecraft-patches/features/0180-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch
@@ -12,7 +12,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/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 7f7304af9bcf252af2e171bf64ebb139f6d30d86..875975594bc1356c416f6824907037aa28d2993d 100644
+index 80d80bc0c6c22ceda190fd238ca63875d47fc599..a1efe500e3751e1345d0c5b7671b378a97541f88 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -2825,6 +2825,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
diff --git a/leaf-server/minecraft-patches/features/0182-Lithium-fast-util.patch b/leaf-server/minecraft-patches/features/0181-Lithium-fast-util.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0182-Lithium-fast-util.patch
rename to leaf-server/minecraft-patches/features/0181-Lithium-fast-util.patch
diff --git a/leaf-server/minecraft-patches/features/0183-Lithium-cached-iterate-outwards.patch b/leaf-server/minecraft-patches/features/0182-Lithium-cached-iterate-outwards.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0183-Lithium-cached-iterate-outwards.patch
rename to leaf-server/minecraft-patches/features/0182-Lithium-cached-iterate-outwards.patch
diff --git a/leaf-server/minecraft-patches/features/0184-Use-faster-and-thread-safe-ban-list-date-format-pars.patch b/leaf-server/minecraft-patches/features/0183-Use-faster-and-thread-safe-ban-list-date-format-pars.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0184-Use-faster-and-thread-safe-ban-list-date-format-pars.patch
rename to leaf-server/minecraft-patches/features/0183-Use-faster-and-thread-safe-ban-list-date-format-pars.patch
diff --git a/leaf-server/minecraft-patches/features/0185-C2ME-Optimize-world-gen-math.patch b/leaf-server/minecraft-patches/features/0184-C2ME-Optimize-world-gen-math.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0185-C2ME-Optimize-world-gen-math.patch
rename to leaf-server/minecraft-patches/features/0184-C2ME-Optimize-world-gen-math.patch
diff --git a/leaf-server/minecraft-patches/features/0186-Cache-chunk-key.patch b/leaf-server/minecraft-patches/features/0185-Cache-chunk-key.patch
similarity index 99%
rename from leaf-server/minecraft-patches/features/0186-Cache-chunk-key.patch
rename to leaf-server/minecraft-patches/features/0185-Cache-chunk-key.patch
index e48bbe09..b0a9e05f 100644
--- a/leaf-server/minecraft-patches/features/0186-Cache-chunk-key.patch
+++ b/leaf-server/minecraft-patches/features/0185-Cache-chunk-key.patch
@@ -97,7 +97,7 @@ index fd3d0f6cb53bc8b6186f0d86575f21007b2c20ed..cddeeab73e7b981701a42c5aad6b4777
          // Paper end - rewrite chunk system
      }
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index b4ee1682a851eb8f1fae999ba0913ae300a71a89..97408ce24313ff26347ff434ab6460e9971c3598 100644
+index b0ac6de9e0f15d234781fc43dd6fd1d5cd6c5ddf..7fb763e89e43698bfb2b9fcf6296705384e8624a 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -508,7 +508,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
diff --git a/leaf-server/minecraft-patches/features/0187-Cache-random-tick-block-status.patch b/leaf-server/minecraft-patches/features/0186-Cache-random-tick-block-status.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0187-Cache-random-tick-block-status.patch
rename to leaf-server/minecraft-patches/features/0186-Cache-random-tick-block-status.patch
diff --git a/leaf-server/minecraft-patches/features/0188-Cache-part-of-canHoldFluid-result.patch b/leaf-server/minecraft-patches/features/0187-Cache-part-of-canHoldFluid-result.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0188-Cache-part-of-canHoldFluid-result.patch
rename to leaf-server/minecraft-patches/features/0187-Cache-part-of-canHoldFluid-result.patch
diff --git a/leaf-server/minecraft-patches/features/0189-Configurable-tripwire-dupe.patch b/leaf-server/minecraft-patches/features/0188-Configurable-tripwire-dupe.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0189-Configurable-tripwire-dupe.patch
rename to leaf-server/minecraft-patches/features/0188-Configurable-tripwire-dupe.patch
diff --git a/leaf-server/minecraft-patches/features/0190-PaperPR-Fix-MC-117075-Block-Entities-Unload-Lag-Spik.patch b/leaf-server/minecraft-patches/features/0189-PaperPR-Fix-MC-117075-Block-Entities-Unload-Lag-Spik.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0190-PaperPR-Fix-MC-117075-Block-Entities-Unload-Lag-Spik.patch
rename to leaf-server/minecraft-patches/features/0189-PaperPR-Fix-MC-117075-Block-Entities-Unload-Lag-Spik.patch
diff --git a/leaf-server/minecraft-patches/features/0191-Sepals-Rearrange-the-attackable-conditions.patch b/leaf-server/minecraft-patches/features/0190-Sepals-Rearrange-the-attackable-conditions.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0191-Sepals-Rearrange-the-attackable-conditions.patch
rename to leaf-server/minecraft-patches/features/0190-Sepals-Rearrange-the-attackable-conditions.patch
diff --git a/leaf-server/minecraft-patches/features/0192-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch b/leaf-server/minecraft-patches/features/0191-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0192-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch
rename to leaf-server/minecraft-patches/features/0191-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch
diff --git a/leaf-server/minecraft-patches/features/0193-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch b/leaf-server/minecraft-patches/features/0192-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch
similarity index 92%
rename from leaf-server/minecraft-patches/features/0193-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch
rename to leaf-server/minecraft-patches/features/0192-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch
index b4425c2f..94ab5108 100644
--- a/leaf-server/minecraft-patches/features/0193-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch
+++ b/leaf-server/minecraft-patches/features/0192-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch
@@ -9,7 +9,7 @@ By default, the server will start rewriting all map datas to the disk after load
 This also slows down world saving a lot if you have a lot of maps
 
 diff --git a/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
-index d049af4f129f6ac2d53f10c7a811c989d1f3edc0..81c30f4a4f411ccedf74e589294a5d279bf51663 100644
+index bf01c9d54248ceb8f97cf1e1c0e4234a338cb8ce..07d35086a41b060b4b9864f0593a08818eee6789 100644
 --- a/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
 +++ b/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
 @@ -160,6 +160,7 @@ public class MapItemSavedData extends SavedData {
diff --git a/leaf-server/minecraft-patches/features/0194-Optimize-checking-nearby-players-for-spawning.patch b/leaf-server/minecraft-patches/features/0193-Optimize-checking-nearby-players-for-spawning.patch
similarity index 97%
rename from leaf-server/minecraft-patches/features/0194-Optimize-checking-nearby-players-for-spawning.patch
rename to leaf-server/minecraft-patches/features/0193-Optimize-checking-nearby-players-for-spawning.patch
index 46adfa91..aaf02131 100644
--- a/leaf-server/minecraft-patches/features/0194-Optimize-checking-nearby-players-for-spawning.patch
+++ b/leaf-server/minecraft-patches/features/0193-Optimize-checking-nearby-players-for-spawning.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize checking nearby players for spawning
 
 
 diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java
-index 634d37f6401f19cc28f9c131dbfbbfefb6c0895a..3c80a42a4d99460d75ab18afae43cfe29e4be798 100644
+index 42555d9fc1b37696b8da4c85f9a809819bcc6dde..5c369b3d94e369c3f240821ad90b9d96223f24ca 100644
 --- a/net/minecraft/server/level/ChunkMap.java
 +++ b/net/minecraft/server/level/ChunkMap.java
 @@ -764,7 +764,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/leaf-server/minecraft-patches/features/0195-Cache-supporting-block-check.patch b/leaf-server/minecraft-patches/features/0194-Cache-supporting-block-check.patch
similarity index 96%
rename from leaf-server/minecraft-patches/features/0195-Cache-supporting-block-check.patch
rename to leaf-server/minecraft-patches/features/0194-Cache-supporting-block-check.patch
index 0b1921fe..c36e02de 100644
--- a/leaf-server/minecraft-patches/features/0195-Cache-supporting-block-check.patch
+++ b/leaf-server/minecraft-patches/features/0194-Cache-supporting-block-check.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cache supporting block check
 
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 23b5695bf27663bbf1f2e3fd2010c0722ad425b0..fea6b829474e4fafbb9986a0c4fd73ae8fae1e09 100644
+index fde4109b27fbafd9db1eaeedf7a6cd754a84024d..129248da7e1bfa5edc1c1a43c98a400f697e735f 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -1104,12 +1104,36 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/leaf-server/minecraft-patches/features/0196-Avoid-useless-deque-clear-on-LevelTicks-cleanupAfter.patch b/leaf-server/minecraft-patches/features/0195-Avoid-useless-deque-clear-on-LevelTicks-cleanupAfter.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0196-Avoid-useless-deque-clear-on-LevelTicks-cleanupAfter.patch
rename to leaf-server/minecraft-patches/features/0195-Avoid-useless-deque-clear-on-LevelTicks-cleanupAfter.patch
diff --git a/leaf-server/minecraft-patches/features/0197-Remove-stream-in-villagers.patch b/leaf-server/minecraft-patches/features/0196-Remove-stream-in-villagers.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0197-Remove-stream-in-villagers.patch
rename to leaf-server/minecraft-patches/features/0196-Remove-stream-in-villagers.patch
diff --git a/leaf-server/minecraft-patches/features/0198-Optimize-baby-villager-sensor.patch b/leaf-server/minecraft-patches/features/0197-Optimize-baby-villager-sensor.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0198-Optimize-baby-villager-sensor.patch
rename to leaf-server/minecraft-patches/features/0197-Optimize-baby-villager-sensor.patch
diff --git a/leaf-server/minecraft-patches/features/0199-Only-player-pushable.patch b/leaf-server/minecraft-patches/features/0198-Only-player-pushable.patch
similarity index 98%
rename from leaf-server/minecraft-patches/features/0199-Only-player-pushable.patch
rename to leaf-server/minecraft-patches/features/0198-Only-player-pushable.patch
index 78a52853..cfc6603b 100644
--- a/leaf-server/minecraft-patches/features/0199-Only-player-pushable.patch
+++ b/leaf-server/minecraft-patches/features/0198-Only-player-pushable.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Only player pushable
 Useful for extreme cases like massive entities collide together in a small area
 
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 875975594bc1356c416f6824907037aa28d2993d..3df99f699db7f25d3e05e2626c4babee87893813 100644
+index a1efe500e3751e1345d0c5b7671b378a97541f88..6d9d8f85bf6936eee76c3d790dd676aa309a1d46 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -3694,7 +3694,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
diff --git a/leaf-server/minecraft-patches/features/0200-Remove-iterators-from-Inventory.patch b/leaf-server/minecraft-patches/features/0199-Remove-iterators-from-Inventory.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0200-Remove-iterators-from-Inventory.patch
rename to leaf-server/minecraft-patches/features/0199-Remove-iterators-from-Inventory.patch
diff --git a/leaf-server/minecraft-patches/features/0201-optimize-mob-despawn.patch b/leaf-server/minecraft-patches/features/0200-optimize-mob-despawn.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0201-optimize-mob-despawn.patch
rename to leaf-server/minecraft-patches/features/0200-optimize-mob-despawn.patch
diff --git a/leaf-server/minecraft-patches/features/0202-Slightly-optimise-getNearestPlayer.patch b/leaf-server/minecraft-patches/features/0201-Slightly-optimise-getNearestPlayer.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0202-Slightly-optimise-getNearestPlayer.patch
rename to leaf-server/minecraft-patches/features/0201-Slightly-optimise-getNearestPlayer.patch
diff --git a/leaf-server/minecraft-patches/features/0203-Bulk-writes-to-writeLongArray-during-chunk-loading.patch b/leaf-server/minecraft-patches/features/0202-Bulk-writes-to-writeLongArray-during-chunk-loading.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0203-Bulk-writes-to-writeLongArray-during-chunk-loading.patch
rename to leaf-server/minecraft-patches/features/0202-Bulk-writes-to-writeLongArray-during-chunk-loading.patch
diff --git a/leaf-server/minecraft-patches/features/0204-Improve-sorting-in-SortedArraySet.patch b/leaf-server/minecraft-patches/features/0203-Improve-sorting-in-SortedArraySet.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0204-Improve-sorting-in-SortedArraySet.patch
rename to leaf-server/minecraft-patches/features/0203-Improve-sorting-in-SortedArraySet.patch
diff --git a/leaf-server/minecraft-patches/features/0205-Make-removeIf-slightly-faster.patch b/leaf-server/minecraft-patches/features/0204-Make-removeIf-slightly-faster.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0205-Make-removeIf-slightly-faster.patch
rename to leaf-server/minecraft-patches/features/0204-Make-removeIf-slightly-faster.patch
diff --git a/leaf-server/minecraft-patches/features/0206-Optimize-LinearPalette.patch b/leaf-server/minecraft-patches/features/0205-Optimize-LinearPalette.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0206-Optimize-LinearPalette.patch
rename to leaf-server/minecraft-patches/features/0205-Optimize-LinearPalette.patch
diff --git a/leaf-server/minecraft-patches/features/0207-Slightly-optimized-VarInt-write.patch b/leaf-server/minecraft-patches/features/0206-Slightly-optimized-VarInt-write.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0207-Slightly-optimized-VarInt-write.patch
rename to leaf-server/minecraft-patches/features/0206-Slightly-optimized-VarInt-write.patch
diff --git a/leaf-server/minecraft-patches/features/0208-Rewrite-ClientboundLightUpdatePacketData.patch b/leaf-server/minecraft-patches/features/0207-Rewrite-ClientboundLightUpdatePacketData.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0208-Rewrite-ClientboundLightUpdatePacketData.patch
rename to leaf-server/minecraft-patches/features/0207-Rewrite-ClientboundLightUpdatePacketData.patch
diff --git a/leaf-server/minecraft-patches/features/0209-Async-chunk-sending.patch b/leaf-server/minecraft-patches/features/0208-Async-chunk-sending.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0209-Async-chunk-sending.patch
rename to leaf-server/minecraft-patches/features/0208-Async-chunk-sending.patch
diff --git a/leaf-server/minecraft-patches/features/0210-Spawner-Configurations.patch b/leaf-server/minecraft-patches/features/0209-Spawner-Configurations.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0210-Spawner-Configurations.patch
rename to leaf-server/minecraft-patches/features/0209-Spawner-Configurations.patch
diff --git a/leaf-server/minecraft-patches/features/0211-SparklyPaper-Parallel-world-ticking.patch b/leaf-server/minecraft-patches/features/0210-SparklyPaper-Parallel-world-ticking.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0211-SparklyPaper-Parallel-world-ticking.patch
rename to leaf-server/minecraft-patches/features/0210-SparklyPaper-Parallel-world-ticking.patch
diff --git a/leaf-server/minecraft-patches/features/0212-SparklyPaper-Track-each-world-MSPT.patch b/leaf-server/minecraft-patches/features/0211-SparklyPaper-Track-each-world-MSPT.patch
similarity index 98%
rename from leaf-server/minecraft-patches/features/0212-SparklyPaper-Track-each-world-MSPT.patch
rename to leaf-server/minecraft-patches/features/0211-SparklyPaper-Track-each-world-MSPT.patch
index ef5139a6..62f32b11 100644
--- a/leaf-server/minecraft-patches/features/0212-SparklyPaper-Track-each-world-MSPT.patch
+++ b/leaf-server/minecraft-patches/features/0211-SparklyPaper-Track-each-world-MSPT.patch
@@ -27,7 +27,7 @@ index c8265f25ead389b025aef6ebe4cc44972132f143..5ad00ebb9e0acab73a8366f0caf06979
              CrashReport crashReport = CrashReport.forThrowable(levelTickingException, "Exception ticking world");
              serverLevel.fillReportDetails(crashReport);
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index bc9cf4aa9b1e71e03100a10c45ef9fc23ee5ae9f..bbe2a420193d15874a4dd384ddb3e24ee2d62420 100644
+index 0b26940e3f1645b6b8d5bd92be4d10fbe17fda58..a4c7fd6214ff37d4eb52e42b021c24a13d6a15c9 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -571,6 +571,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
diff --git a/leaf-server/minecraft-patches/features/0213-PaperPR-Fix-cancelled-Projectile-Events-still-consum.patch b/leaf-server/minecraft-patches/features/0212-PaperPR-Fix-cancelled-Projectile-Events-still-consum.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0213-PaperPR-Fix-cancelled-Projectile-Events-still-consum.patch
rename to leaf-server/minecraft-patches/features/0212-PaperPR-Fix-cancelled-Projectile-Events-still-consum.patch
diff --git a/leaf-server/minecraft-patches/features/0214-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch b/leaf-server/minecraft-patches/features/0213-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0214-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch
rename to leaf-server/minecraft-patches/features/0213-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch
diff --git a/leaf-server/minecraft-patches/features/0215-rewrite-InsideBrownianWalk.patch b/leaf-server/minecraft-patches/features/0214-rewrite-InsideBrownianWalk.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0215-rewrite-InsideBrownianWalk.patch
rename to leaf-server/minecraft-patches/features/0214-rewrite-InsideBrownianWalk.patch
diff --git a/leaf-server/minecraft-patches/features/0216-Use-BFS-on-getSlopeDistance.patch b/leaf-server/minecraft-patches/features/0215-Use-BFS-on-getSlopeDistance.patch
similarity index 98%
rename from leaf-server/minecraft-patches/features/0216-Use-BFS-on-getSlopeDistance.patch
rename to leaf-server/minecraft-patches/features/0215-Use-BFS-on-getSlopeDistance.patch
index cd937089..17024913 100644
--- a/leaf-server/minecraft-patches/features/0216-Use-BFS-on-getSlopeDistance.patch
+++ b/leaf-server/minecraft-patches/features/0215-Use-BFS-on-getSlopeDistance.patch
@@ -9,7 +9,7 @@ Leaf: ~48ms (-36%)
 This should help drastically on the farms that use actively changing fluids.
 
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index f20d7591e473a37a0f5b97c60c2eb9974980b41e..4df5bf806b84d03b2aed13fcf6ab2c00a6698d86 100644
+index a4c7fd6214ff37d4eb52e42b021c24a13d6a15c9..9453d65fbe08911674cf9090d8729264429c8d8a 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -1443,6 +1443,10 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
diff --git a/leaf-server/minecraft-patches/features/0217-Paper-PR-Throttle-failed-spawn-attempts.patch b/leaf-server/minecraft-patches/features/0216-Paper-PR-Throttle-failed-spawn-attempts.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0217-Paper-PR-Throttle-failed-spawn-attempts.patch
rename to leaf-server/minecraft-patches/features/0216-Paper-PR-Throttle-failed-spawn-attempts.patch
diff --git a/leaf-server/minecraft-patches/features/0218-Improve-BlockEntity-ticking-isRemoved-check.patch b/leaf-server/minecraft-patches/features/0217-Improve-BlockEntity-ticking-isRemoved-check.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0218-Improve-BlockEntity-ticking-isRemoved-check.patch
rename to leaf-server/minecraft-patches/features/0217-Improve-BlockEntity-ticking-isRemoved-check.patch
diff --git a/leaf-server/minecraft-patches/features/0219-Raytrace-AntiXray-SDK-integration.patch b/leaf-server/minecraft-patches/features/0218-Raytrace-AntiXray-SDK-integration.patch
similarity index 96%
rename from leaf-server/minecraft-patches/features/0219-Raytrace-AntiXray-SDK-integration.patch
rename to leaf-server/minecraft-patches/features/0218-Raytrace-AntiXray-SDK-integration.patch
index bdd1e616..533e01db 100644
--- a/leaf-server/minecraft-patches/features/0219-Raytrace-AntiXray-SDK-integration.patch
+++ b/leaf-server/minecraft-patches/features/0218-Raytrace-AntiXray-SDK-integration.patch
@@ -8,7 +8,7 @@ Integrated with Imanity Software's Raytrace AntiXray for better performance
 Original project: https://github.com/Imanity-Software/raytrace-antixray-spigot-sdk
 
 diff --git a/net/minecraft/server/level/ServerPlayerGameMode.java b/net/minecraft/server/level/ServerPlayerGameMode.java
-index c4a4f08272b34f72dea4feaaeb66d153b2aab8c8..be5da5a81246b4f4abe19f7c0cf68990d6bdf5bd 100644
+index d638821595138ef972163925136eb57207b31719..02c02314a4a6a7a6da427f0d064dbc61ce92301d 100644
 --- a/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -296,6 +296,12 @@ public class ServerPlayerGameMode {
diff --git a/leaf-server/minecraft-patches/features/0220-Optimize-addOrUpdateTransientModifier.patch b/leaf-server/minecraft-patches/features/0219-Optimize-addOrUpdateTransientModifier.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0220-Optimize-addOrUpdateTransientModifier.patch
rename to leaf-server/minecraft-patches/features/0219-Optimize-addOrUpdateTransientModifier.patch
diff --git a/leaf-server/minecraft-patches/features/0221-Optimize-ContextMap.create.patch b/leaf-server/minecraft-patches/features/0220-Optimize-ContextMap.create.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0221-Optimize-ContextMap.create.patch
rename to leaf-server/minecraft-patches/features/0220-Optimize-ContextMap.create.patch
diff --git a/leaf-server/minecraft-patches/features/0222-Micro-optimizations-for-random-tick.patch b/leaf-server/minecraft-patches/features/0221-Micro-optimizations-for-random-tick.patch
similarity index 97%
rename from leaf-server/minecraft-patches/features/0222-Micro-optimizations-for-random-tick.patch
rename to leaf-server/minecraft-patches/features/0221-Micro-optimizations-for-random-tick.patch
index 644d08dd..e0e666fe 100644
--- a/leaf-server/minecraft-patches/features/0222-Micro-optimizations-for-random-tick.patch
+++ b/leaf-server/minecraft-patches/features/0221-Micro-optimizations-for-random-tick.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Micro optimizations for random tick
 
 
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 4df5bf806b84d03b2aed13fcf6ab2c00a6698d86..ab509260d536dfb5cb0268c20abf445498602fff 100644
+index 9453d65fbe08911674cf9090d8729264429c8d8a..a1c2e9018800339fca62d95c522da1bf254568fe 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -1041,7 +1041,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
diff --git a/leaf-server/minecraft-patches/features/0223-Remove-streams-on-updateConnectedPlayersWithinRange.patch b/leaf-server/minecraft-patches/features/0222-Remove-streams-on-updateConnectedPlayersWithinRange.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0223-Remove-streams-on-updateConnectedPlayersWithinRange.patch
rename to leaf-server/minecraft-patches/features/0222-Remove-streams-on-updateConnectedPlayersWithinRange.patch
diff --git a/leaf-server/minecraft-patches/features/0224-Remove-streams-on-PlayerDetector.patch b/leaf-server/minecraft-patches/features/0223-Remove-streams-on-PlayerDetector.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0224-Remove-streams-on-PlayerDetector.patch
rename to leaf-server/minecraft-patches/features/0223-Remove-streams-on-PlayerDetector.patch
diff --git a/leaf-server/minecraft-patches/features/0225-Use-direct-iteration-on-Sensing.tick.patch b/leaf-server/minecraft-patches/features/0224-Use-direct-iteration-on-Sensing.tick.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0225-Use-direct-iteration-on-Sensing.tick.patch
rename to leaf-server/minecraft-patches/features/0224-Use-direct-iteration-on-Sensing.tick.patch
diff --git a/leaf-server/minecraft-patches/features/0226-Optimise-non-flush-packet-sending.patch b/leaf-server/minecraft-patches/features/0225-Optimise-non-flush-packet-sending.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0226-Optimise-non-flush-packet-sending.patch
rename to leaf-server/minecraft-patches/features/0225-Optimise-non-flush-packet-sending.patch
diff --git a/leaf-server/minecraft-patches/features/0227-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch b/leaf-server/minecraft-patches/features/0226-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch
similarity index 96%
rename from leaf-server/minecraft-patches/features/0227-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch
rename to leaf-server/minecraft-patches/features/0226-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch
index bba19a09..d34ae1d7 100644
--- a/leaf-server/minecraft-patches/features/0227-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch
+++ b/leaf-server/minecraft-patches/features/0226-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch
@@ -11,7 +11,7 @@ As part of: Airplane (https://github.com/TECHNOVE/Airplane)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 4be8e90dfe99663ea84dae04d9bb2b0e3bb01098..aa1c937f8cee164b9e832b7d155bcbcf22e95b63 100644
+index b1b9bc9be22da5a9a683e907766aaaafee0129ec..bfd486c85942a7d7b3e00724dd08319381222230 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -4812,10 +4812,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/leaf-server/minecraft-patches/features/0228-Null-handling-on-MultifaceSpreader.patch b/leaf-server/minecraft-patches/features/0227-Null-handling-on-MultifaceSpreader.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0228-Null-handling-on-MultifaceSpreader.patch
rename to leaf-server/minecraft-patches/features/0227-Null-handling-on-MultifaceSpreader.patch
diff --git a/leaf-server/minecraft-patches/features/0229-More-virtual-threads.patch b/leaf-server/minecraft-patches/features/0228-More-virtual-threads.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0229-More-virtual-threads.patch
rename to leaf-server/minecraft-patches/features/0228-More-virtual-threads.patch
diff --git a/leaf-server/minecraft-patches/features/0230-Async-target-finding.patch b/leaf-server/minecraft-patches/features/0229-Async-target-finding.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0230-Async-target-finding.patch
rename to leaf-server/minecraft-patches/features/0229-Async-target-finding.patch
diff --git a/leaf-server/minecraft-patches/features/0231-Optimize-ThreadedTicketLevelPropagator.patch b/leaf-server/minecraft-patches/features/0230-Optimize-ThreadedTicketLevelPropagator.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0231-Optimize-ThreadedTicketLevelPropagator.patch
rename to leaf-server/minecraft-patches/features/0230-Optimize-ThreadedTicketLevelPropagator.patch
diff --git a/leaf-server/minecraft-patches/features/0232-Optimise-MobEffectUtil-getDigSpeedAmplification.patch b/leaf-server/minecraft-patches/features/0231-Optimise-MobEffectUtil-getDigSpeedAmplification.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0232-Optimise-MobEffectUtil-getDigSpeedAmplification.patch
rename to leaf-server/minecraft-patches/features/0231-Optimise-MobEffectUtil-getDigSpeedAmplification.patch
diff --git a/leaf-server/minecraft-patches/features/0233-Optimise-chunkUnloads.patch b/leaf-server/minecraft-patches/features/0232-Optimise-chunkUnloads.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0233-Optimise-chunkUnloads.patch
rename to leaf-server/minecraft-patches/features/0232-Optimise-chunkUnloads.patch
diff --git a/leaf-server/minecraft-patches/features/0234-Optimize-BlockEntityType-isValid.patch b/leaf-server/minecraft-patches/features/0233-Optimize-BlockEntityType-isValid.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0234-Optimize-BlockEntityType-isValid.patch
rename to leaf-server/minecraft-patches/features/0233-Optimize-BlockEntityType-isValid.patch
diff --git a/leaf-server/minecraft-patches/features/0235-PaperPR-Add-ticket-on-player-join-to-avoid-chunk-loa.patch b/leaf-server/minecraft-patches/features/0234-PaperPR-Add-ticket-on-player-join-to-avoid-chunk-loa.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0235-PaperPR-Add-ticket-on-player-join-to-avoid-chunk-loa.patch
rename to leaf-server/minecraft-patches/features/0234-PaperPR-Add-ticket-on-player-join-to-avoid-chunk-loa.patch
diff --git a/leaf-server/minecraft-patches/features/0236-Sakura-copy-EntityList-implementation-to-BasicEntity.patch b/leaf-server/minecraft-patches/features/0235-Sakura-copy-EntityList-implementation-to-BasicEntity.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0236-Sakura-copy-EntityList-implementation-to-BasicEntity.patch
rename to leaf-server/minecraft-patches/features/0235-Sakura-copy-EntityList-implementation-to-BasicEntity.patch
diff --git a/leaf-server/minecraft-patches/features/0237-Protocol-Core.patch b/leaf-server/minecraft-patches/features/0236-Protocol-Core.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0237-Protocol-Core.patch
rename to leaf-server/minecraft-patches/features/0236-Protocol-Core.patch
diff --git a/leaf-server/minecraft-patches/features/0238-Async-switch-connection-state.patch b/leaf-server/minecraft-patches/features/0237-Async-switch-connection-state.patch
similarity index 98%
rename from leaf-server/minecraft-patches/features/0238-Async-switch-connection-state.patch
rename to leaf-server/minecraft-patches/features/0237-Async-switch-connection-state.patch
index 2e02605c..f1e44773 100644
--- a/leaf-server/minecraft-patches/features/0238-Async-switch-connection-state.patch
+++ b/leaf-server/minecraft-patches/features/0237-Async-switch-connection-state.patch
@@ -110,10 +110,10 @@ index c032d5beb28a2181697cc43bd295d839464d34ed..ed593fa6795f0fd05e38bba3b656dcd7
          try {
              PlayerList playerList = this.server.getPlayerList();
 diff --git a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 2e014cd543a6a790a0023835199b0e956e49fd1f..72115a4d2c54834f9edef02c83ed79f0fe380e78 100644
+index f68923c5f6fbecd8f1c10a30dbd06ed0dfee8b84..4fe2fbe7b8329a0507ac94f42b0db78038c566d8 100644
 --- a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-@@ -459,11 +459,31 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
+@@ -416,11 +416,31 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
          this.disconnect(ServerCommonPacketListenerImpl.DISCONNECT_UNEXPECTED_QUERY);
      }
  
diff --git a/leaf-server/minecraft-patches/features/0239-Optimize-BlockEntities-tickersInLevel.patch b/leaf-server/minecraft-patches/features/0238-Optimize-BlockEntities-tickersInLevel.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0239-Optimize-BlockEntities-tickersInLevel.patch
rename to leaf-server/minecraft-patches/features/0238-Optimize-BlockEntities-tickersInLevel.patch
diff --git a/leaf-server/minecraft-patches/features/0240-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch b/leaf-server/minecraft-patches/features/0239-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0240-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch
rename to leaf-server/minecraft-patches/features/0239-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch
diff --git a/leaf-server/minecraft-patches/features/0241-Flush-location-while-knockback.patch b/leaf-server/minecraft-patches/features/0240-Flush-location-while-knockback.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0241-Flush-location-while-knockback.patch
rename to leaf-server/minecraft-patches/features/0240-Flush-location-while-knockback.patch
diff --git a/leaf-server/minecraft-patches/features/0242-Only-tick-items-at-hand.patch b/leaf-server/minecraft-patches/features/0241-Only-tick-items-at-hand.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0242-Only-tick-items-at-hand.patch
rename to leaf-server/minecraft-patches/features/0241-Only-tick-items-at-hand.patch
diff --git a/leaf-server/minecraft-patches/features/0243-Smart-sort-items-in-NearestItemSensor.patch b/leaf-server/minecraft-patches/features/0242-Smart-sort-items-in-NearestItemSensor.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0243-Smart-sort-items-in-NearestItemSensor.patch
rename to leaf-server/minecraft-patches/features/0242-Smart-sort-items-in-NearestItemSensor.patch
diff --git a/leaf-server/minecraft-patches/features/0244-Optimise-player-movement-checks.patch b/leaf-server/minecraft-patches/features/0243-Optimise-player-movement-checks.patch
similarity index 90%
rename from leaf-server/minecraft-patches/features/0244-Optimise-player-movement-checks.patch
rename to leaf-server/minecraft-patches/features/0243-Optimise-player-movement-checks.patch
index e3746135..b6b543f7 100644
--- a/leaf-server/minecraft-patches/features/0244-Optimise-player-movement-checks.patch
+++ b/leaf-server/minecraft-patches/features/0243-Optimise-player-movement-checks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimise player movement checks
 
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 9a13cf8460472b8d3968cd8269a2b63d0b49f1a9..5f82c902c9229e8bbba5dc74a89ff4a27e7649fc 100644
+index bfd486c85942a7d7b3e00724dd08319381222230..f70fff36ba616afbd1869caeee1b20d4c1579a19 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -1216,7 +1216,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/leaf-server/minecraft-patches/features/0245-Remove-streams-in-MobSensor.patch b/leaf-server/minecraft-patches/features/0244-Remove-streams-in-MobSensor.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0245-Remove-streams-in-MobSensor.patch
rename to leaf-server/minecraft-patches/features/0244-Remove-streams-in-MobSensor.patch
diff --git a/leaf-server/minecraft-patches/features/0246-Remove-streams-in-TemptingSensor.patch b/leaf-server/minecraft-patches/features/0245-Remove-streams-in-TemptingSensor.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0246-Remove-streams-in-TemptingSensor.patch
rename to leaf-server/minecraft-patches/features/0245-Remove-streams-in-TemptingSensor.patch
diff --git a/leaf-server/minecraft-patches/features/0247-Use-HashedList-on-WeightedList.patch b/leaf-server/minecraft-patches/features/0246-Use-HashedList-on-WeightedList.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0247-Use-HashedList-on-WeightedList.patch
rename to leaf-server/minecraft-patches/features/0246-Use-HashedList-on-WeightedList.patch
diff --git a/leaf-server/minecraft-patches/features/0248-Add-configurable-death-item-drop-knockback-settings.patch b/leaf-server/minecraft-patches/features/0247-Add-configurable-death-item-drop-knockback-settings.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0248-Add-configurable-death-item-drop-knockback-settings.patch
rename to leaf-server/minecraft-patches/features/0247-Add-configurable-death-item-drop-knockback-settings.patch
diff --git a/leaf-server/minecraft-patches/features/0249-Optimize-getScaledTrackingDistance.patch b/leaf-server/minecraft-patches/features/0248-Optimize-getScaledTrackingDistance.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0249-Optimize-getScaledTrackingDistance.patch
rename to leaf-server/minecraft-patches/features/0248-Optimize-getScaledTrackingDistance.patch
diff --git a/leaf-server/minecraft-patches/features/0250-Optimize-SynchedEntityData-packDirty.patch b/leaf-server/minecraft-patches/features/0249-Optimize-SynchedEntityData-packDirty.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0250-Optimize-SynchedEntityData-packDirty.patch
rename to leaf-server/minecraft-patches/features/0249-Optimize-SynchedEntityData-packDirty.patch
diff --git a/leaf-server/minecraft-patches/features/0251-Optimize-isEyeInFluid.patch b/leaf-server/minecraft-patches/features/0250-Optimize-isEyeInFluid.patch
similarity index 99%
rename from leaf-server/minecraft-patches/features/0251-Optimize-isEyeInFluid.patch
rename to leaf-server/minecraft-patches/features/0250-Optimize-isEyeInFluid.patch
index e11ffdb8..3da9a6ea 100644
--- a/leaf-server/minecraft-patches/features/0251-Optimize-isEyeInFluid.patch
+++ b/leaf-server/minecraft-patches/features/0250-Optimize-isEyeInFluid.patch
@@ -92,7 +92,7 @@ index 8cb7fa08f442d2d6b87261d3cc9546e31d1ec02b..b0e4a7066ab12a0f7890e529f12027b3
                  if (rounded > 0) {
                      this.awardStat(Stats.WALK_UNDER_WATER_ONE_CM, rounded);
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index ab0cf0bff7b477327fd92a20e6c7bc7d62f418d2..ceede6519645cb488ea4152842e00751eef53a6c 100644
+index f70fff36ba616afbd1869caeee1b20d4c1579a19..e054c2416919fe8814412e6e06cd82e4ea537c84 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -288,7 +288,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/leaf-server/minecraft-patches/features/0252-Cache-block-path-type.patch b/leaf-server/minecraft-patches/features/0251-Cache-block-path-type.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0252-Cache-block-path-type.patch
rename to leaf-server/minecraft-patches/features/0251-Cache-block-path-type.patch
diff --git a/leaf-server/minecraft-patches/features/0253-optimize-getEntityStatus.patch b/leaf-server/minecraft-patches/features/0252-optimize-getEntityStatus.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0253-optimize-getEntityStatus.patch
rename to leaf-server/minecraft-patches/features/0252-optimize-getEntityStatus.patch
diff --git a/leaf-server/minecraft-patches/features/0254-Rail-Optimization-optimized-PoweredRailBlock-logic.patch b/leaf-server/minecraft-patches/features/0253-Rail-Optimization-optimized-PoweredRailBlock-logic.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0254-Rail-Optimization-optimized-PoweredRailBlock-logic.patch
rename to leaf-server/minecraft-patches/features/0253-Rail-Optimization-optimized-PoweredRailBlock-logic.patch
diff --git a/leaf-server/minecraft-patches/features/0255-optimise-ChunkGenerator-getMobsAt.patch b/leaf-server/minecraft-patches/features/0254-optimise-ChunkGenerator-getMobsAt.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0255-optimise-ChunkGenerator-getMobsAt.patch
rename to leaf-server/minecraft-patches/features/0254-optimise-ChunkGenerator-getMobsAt.patch
diff --git a/leaf-server/minecraft-patches/features/0256-cache-getBiome.patch b/leaf-server/minecraft-patches/features/0255-cache-getBiome.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0256-cache-getBiome.patch
rename to leaf-server/minecraft-patches/features/0255-cache-getBiome.patch
diff --git a/leaf-server/minecraft-patches/features/0257-optimize-mob-spawning.patch b/leaf-server/minecraft-patches/features/0256-optimize-mob-spawning.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0257-optimize-mob-spawning.patch
rename to leaf-server/minecraft-patches/features/0256-optimize-mob-spawning.patch
diff --git a/leaf-server/minecraft-patches/features/0258-optimize-structure-map.patch b/leaf-server/minecraft-patches/features/0257-optimize-structure-map.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0258-optimize-structure-map.patch
rename to leaf-server/minecraft-patches/features/0257-optimize-structure-map.patch
diff --git a/leaf-server/minecraft-patches/features/0259-throttle-mob-spawning.patch b/leaf-server/minecraft-patches/features/0258-throttle-mob-spawning.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0259-throttle-mob-spawning.patch
rename to leaf-server/minecraft-patches/features/0258-throttle-mob-spawning.patch
diff --git a/leaf-server/minecraft-patches/features/0260-Add-BlockExplosionHitEvent.patch b/leaf-server/minecraft-patches/features/0259-Add-BlockExplosionHitEvent.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0260-Add-BlockExplosionHitEvent.patch
rename to leaf-server/minecraft-patches/features/0259-Add-BlockExplosionHitEvent.patch
diff --git a/leaf-server/minecraft-patches/features/0261-Old-Blast-Protection-explosion-knockback.patch b/leaf-server/minecraft-patches/features/0260-Old-Blast-Protection-explosion-knockback.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0261-Old-Blast-Protection-explosion-knockback.patch
rename to leaf-server/minecraft-patches/features/0260-Old-Blast-Protection-explosion-knockback.patch
diff --git a/leaf-server/minecraft-patches/features/0262-Use-UUID-for-cure-reputation.patch b/leaf-server/minecraft-patches/features/0261-Use-UUID-for-cure-reputation.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0262-Use-UUID-for-cure-reputation.patch
rename to leaf-server/minecraft-patches/features/0261-Use-UUID-for-cure-reputation.patch
diff --git a/leaf-server/minecraft-patches/features/0263-Fix-crash-during-parsing-unknown-command-message.patch b/leaf-server/minecraft-patches/features/0262-Fix-crash-during-parsing-unknown-command-message.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0263-Fix-crash-during-parsing-unknown-command-message.patch
rename to leaf-server/minecraft-patches/features/0262-Fix-crash-during-parsing-unknown-command-message.patch
diff --git a/leaf-server/minecraft-patches/features/0264-optimize-random-tick.patch b/leaf-server/minecraft-patches/features/0263-optimize-random-tick.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0264-optimize-random-tick.patch
rename to leaf-server/minecraft-patches/features/0263-optimize-random-tick.patch
diff --git a/leaf-server/minecraft-patches/features/0265-do-not-log-invalid-flatten-text-component-parse.patch b/leaf-server/minecraft-patches/features/0264-do-not-log-invalid-flatten-text-component-parse.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0265-do-not-log-invalid-flatten-text-component-parse.patch
rename to leaf-server/minecraft-patches/features/0264-do-not-log-invalid-flatten-text-component-parse.patch
diff --git a/leaf-server/minecraft-patches/features/0266-Fast-BiomeManager-seed-obfuscation.patch b/leaf-server/minecraft-patches/features/0265-Fast-BiomeManager-seed-obfuscation.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0266-Fast-BiomeManager-seed-obfuscation.patch
rename to leaf-server/minecraft-patches/features/0265-Fast-BiomeManager-seed-obfuscation.patch
diff --git a/leaf-server/minecraft-patches/features/0267-Replace-EntitySelectorOptions-map-with-optimized-col.patch b/leaf-server/minecraft-patches/features/0266-Replace-EntitySelectorOptions-map-with-optimized-col.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0267-Replace-EntitySelectorOptions-map-with-optimized-col.patch
rename to leaf-server/minecraft-patches/features/0266-Replace-EntitySelectorOptions-map-with-optimized-col.patch
diff --git a/leaf-server/minecraft-patches/features/0268-optimize-no-action-time.patch b/leaf-server/minecraft-patches/features/0267-optimize-no-action-time.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0268-optimize-no-action-time.patch
rename to leaf-server/minecraft-patches/features/0267-optimize-no-action-time.patch
diff --git a/leaf-server/minecraft-patches/features/0269-optimize-waypoint.patch b/leaf-server/minecraft-patches/features/0268-optimize-waypoint.patch
similarity index 96%
rename from leaf-server/minecraft-patches/features/0269-optimize-waypoint.patch
rename to leaf-server/minecraft-patches/features/0268-optimize-waypoint.patch
index 9faccfc8..8b737ead 100644
--- a/leaf-server/minecraft-patches/features/0269-optimize-waypoint.patch
+++ b/leaf-server/minecraft-patches/features/0268-optimize-waypoint.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] optimize waypoint
 
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index e054c2416919fe8814412e6e06cd82e4ea537c84..a253d714670f932d67e2c44fdf895716b6b595ec 100644
+index ceede6519645cb488ea4152842e00751eef53a6c..5eaaeb6f6a87d3a2d851b1840c4f3acbc47a0766 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -5144,6 +5144,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/leaf-server/minecraft-patches/features/0270-Paw-optimization.patch b/leaf-server/minecraft-patches/features/0269-Paw-optimization.patch
similarity index 99%
rename from leaf-server/minecraft-patches/features/0270-Paw-optimization.patch
rename to leaf-server/minecraft-patches/features/0269-Paw-optimization.patch
index d35e99e0..042f4a63 100644
--- a/leaf-server/minecraft-patches/features/0270-Paw-optimization.patch
+++ b/leaf-server/minecraft-patches/features/0269-Paw-optimization.patch
@@ -132,7 +132,7 @@ index 964c97a394122083a2f3c77b8ca529592c826080..a58ba94171b54feee82e4ec3d68d23f4
  
      private void tickPassenger(Entity ridingEntity, Entity passengerEntity, final boolean isActive) { // Paper - EAR 2
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index a253d714670f932d67e2c44fdf895716b6b595ec..641ad9779e7822d29d35a199fed8766887e62a8e 100644
+index 5eaaeb6f6a87d3a2d851b1840c4f3acbc47a0766..30a8c865bc754216266a1d1932130972f2fd67a2 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -1170,16 +1170,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/leaf-server/minecraft-patches/features/0271-Fix-Paper-config-fixClimbingBypassingCrammingRule.patch b/leaf-server/minecraft-patches/features/0270-Fix-Paper-config-fixClimbingBypassingCrammingRule.patch
similarity index 95%
rename from leaf-server/minecraft-patches/features/0271-Fix-Paper-config-fixClimbingBypassingCrammingRule.patch
rename to leaf-server/minecraft-patches/features/0270-Fix-Paper-config-fixClimbingBypassingCrammingRule.patch
index c0cf0696..2eea5860 100644
--- a/leaf-server/minecraft-patches/features/0271-Fix-Paper-config-fixClimbingBypassingCrammingRule.patch
+++ b/leaf-server/minecraft-patches/features/0270-Fix-Paper-config-fixClimbingBypassingCrammingRule.patch
@@ -19,7 +19,7 @@ index 5307e80f6e84df7a053e7132883d8338bbd751a0..d6be86981219f0fe0db15d36d9c85e9a
          // Leaf end - Only player pushable
          if (!pushableEntities.isEmpty()) {
 diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
-index 9b4e6fdbedfa378ea436cdd5f1a36e2b3d94be17..645fad313ed3cd6ea5afe25c5d29dce828993371 100644
+index 06b46b973df84b16842a28f73df75613d09e75c9..f1f2775b56caf4820e03aa87f895c6570b271187 100644
 --- a/net/minecraft/world/level/Level.java
 +++ b/net/minecraft/world/level/Level.java
 @@ -1909,7 +1909,7 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
diff --git a/leaf-server/minecraft-patches/features/0272-Skip-inactive-entity-for-execute.patch b/leaf-server/minecraft-patches/features/0271-Skip-inactive-entity-for-execute.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0272-Skip-inactive-entity-for-execute.patch
rename to leaf-server/minecraft-patches/features/0271-Skip-inactive-entity-for-execute.patch
diff --git a/leaf-server/minecraft-patches/features/0273-Optimise-getEntities.patch b/leaf-server/minecraft-patches/features/0272-Optimise-getEntities.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0273-Optimise-getEntities.patch
rename to leaf-server/minecraft-patches/features/0272-Optimise-getEntities.patch
diff --git a/leaf-server/minecraft-patches/features/0274-fix-MC-298464.patch b/leaf-server/minecraft-patches/features/0273-fix-MC-298464.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0274-fix-MC-298464.patch
rename to leaf-server/minecraft-patches/features/0273-fix-MC-298464.patch
diff --git a/leaf-server/minecraft-patches/features/0275-Re-route-SetClosestHomeAsWalkTarget-s-poi-finding-to.patch b/leaf-server/minecraft-patches/features/0274-Re-route-SetClosestHomeAsWalkTarget-s-poi-finding-to.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0275-Re-route-SetClosestHomeAsWalkTarget-s-poi-finding-to.patch
rename to leaf-server/minecraft-patches/features/0274-Re-route-SetClosestHomeAsWalkTarget-s-poi-finding-to.patch
diff --git a/leaf-server/minecraft-patches/features/0276-optimize-checkInsideBlocks-calls.patch b/leaf-server/minecraft-patches/features/0275-optimize-checkInsideBlocks-calls.patch
similarity index 99%
rename from leaf-server/minecraft-patches/features/0276-optimize-checkInsideBlocks-calls.patch
rename to leaf-server/minecraft-patches/features/0275-optimize-checkInsideBlocks-calls.patch
index 2b09f2d0..a7ba6ec6 100644
--- a/leaf-server/minecraft-patches/features/0276-optimize-checkInsideBlocks-calls.patch
+++ b/leaf-server/minecraft-patches/features/0275-optimize-checkInsideBlocks-calls.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] optimize checkInsideBlocks calls
 License: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 641ad9779e7822d29d35a199fed8766887e62a8e..4a6f3e060496c831f8d810148e4f36a57f5e9f5d 100644
+index 30a8c865bc754216266a1d1932130972f2fd67a2..e7b375720c1bb78a9c3edf6d49c973eba1fcf115 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -1733,8 +1733,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/leaf-server/minecraft-patches/features/0277-Op-lock.patch b/leaf-server/minecraft-patches/features/0276-Op-lock.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0277-Op-lock.patch
rename to leaf-server/minecraft-patches/features/0276-Op-lock.patch
diff --git a/leaf-server/paper-patches/features/0063-cache-profile-data.patch b/leaf-server/paper-patches/features/0063-cache-profile-data.patch
new file mode 100644
index 00000000..a3c4a493
--- /dev/null
+++ b/leaf-server/paper-patches/features/0063-cache-profile-data.patch
@@ -0,0 +1,146 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Taiyou06 <kaandindar21@gmail.com>
+Date: Tue, 22 Jul 2025 01:24:40 +0200
+Subject: [PATCH] cache profile data
+
+This patch includes code that references the Caffeine caching library,
+which is licensed under the Apache License, Version 2.0.
+
+Caffeine (https://github.com/ben-manes/caffeine)
+Copyright (c) Ben Manes
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Aside from the Caffeine cache, the code is licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
+
+diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
+index d2d16055df7ca3c625a720dfca5b4cd090e2972e..db43329d57144471d0c9ce0eed92d2f1bd05f120 100644
+--- a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
++++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
+@@ -35,6 +35,13 @@ public class CraftPlayerProfile implements PlayerProfile, SharedPlayerProfile {
+     private GameProfile profile;
+     private final PropertySet properties = new PropertySet();
+ 
++    // Leaf start - cache profile data
++    private static final com.github.benmanes.caffeine.cache.Cache<UUID, ProfileResult> PROFILE_DATA_CACHE = com.github.benmanes.caffeine.cache.Caffeine.newBuilder()
++        .expireAfterWrite(org.dreeam.leaf.config.modules.misc.CacheProfileLookup.timeout, java.util.concurrent.TimeUnit.MINUTES)
++        .maximumSize(org.dreeam.leaf.config.modules.misc.CacheProfileLookup.maxSize)
++        .build();
++    // Leaf end - cache profile data
++
+     public CraftPlayerProfile(CraftPlayer player) {
+         this.profile = player.getHandle().getGameProfile();
+     }
+@@ -195,11 +202,7 @@ public class CraftPlayerProfile implements PlayerProfile, SharedPlayerProfile {
+ 
+     @Override
+     public @NotNull CompletableFuture<PlayerProfile> update() {
+-        return CompletableFuture.supplyAsync(() -> {
+-            final CraftPlayerProfile clone = clone();
+-            clone.complete(true);
+-            return clone;
+-        }, Util.PROFILE_EXECUTOR);
++        return CompletableFuture.supplyAsync(this::getNewProfile, Util.PROFILE_EXECUTOR); // Leaf - cache profile data
+     }
+ 
+     @Override
+@@ -260,7 +263,7 @@ public class CraftPlayerProfile implements PlayerProfile, SharedPlayerProfile {
+         MinecraftServer server = MinecraftServer.getServer();
+         boolean isCompleteFromCache = this.completeFromCache(true, onlineMode);
+         if (onlineMode && (!isCompleteFromCache || (textures && !hasTextures()))) {
+-            ProfileResult result = server.getSessionService().fetchProfile(this.profile.getId(), true);
++            ProfileResult result = this.fetchProfile(server); // Leaf - cache profile data
+             if (result != null && result.profile() != null) {
+                 copyProfileProperties(result.profile(), this.profile, true);
+             }
+@@ -271,6 +274,80 @@ public class CraftPlayerProfile implements PlayerProfile, SharedPlayerProfile {
+         return this.isComplete() && (!onlineMode || !textures || hasTextures());
+     }
+ 
++    // Leaf start - cache profile data
++    // com.destroystokyo.paper.profile.CraftPlayerProfile#update is never used in server internal
++    // Probably only very rare plugins may use this. So here is just for cache update consistency.
++    // getNewProfile originally copied from org.bukkit.craftbukkit.profile.CraftPlayerProfile#getUpdatedProfile
++    private CraftPlayerProfile getNewProfile() {
++        MinecraftServer server = MinecraftServer.getServer();
++        GameProfile currentProfile = this.buildGameProfile();
++
++        // Try to get profile from cache if UUID is not set
++        if (currentProfile.getId().equals(Util.NIL_UUID) && server.getProfileCache() != null) {
++            currentProfile = server.getProfileCache().get(currentProfile.getName()).orElse(currentProfile);
++        }
++
++        // Fetch profile data if we have a valid UUID
++        if (!currentProfile.getId().equals(Util.NIL_UUID)) {
++            if (org.dreeam.leaf.config.modules.misc.CacheProfileLookup.enabled &&
++                PROFILE_DATA_CACHE.asMap().containsKey(currentProfile.getId())) {
++
++                ProfileResult cachedData = PROFILE_DATA_CACHE.getIfPresent(currentProfile.getId());
++                if (cachedData != null) {
++                    currentProfile = cachedData.profile();
++                }
++            } else {
++                ProfileResult fetchedData = server.getSessionService().fetchProfile(currentProfile.getId(), true);
++                if (org.dreeam.leaf.config.modules.misc.CacheProfileLookup.enabled && fetchedData != null) {
++                    PROFILE_DATA_CACHE.put(currentProfile.getId(), fetchedData);
++                }
++                if (fetchedData != null) {
++                    currentProfile = fetchedData.profile();
++                }
++            }
++        }
++
++        return new CraftPlayerProfile(currentProfile);
++    }
++
++    private ProfileResult fetchProfile(MinecraftServer server) {
++        GameProfile targetProfile = this.buildGameProfile();
++
++        // Resolve UUID from name cache if needed
++        if (targetProfile.getId().equals(Util.NIL_UUID) && server.getProfileCache() != null) {
++            targetProfile = server.getProfileCache().get(targetProfile.getName()).orElse(targetProfile);
++        }
++
++        // Skip if still no valid UUID
++        if (targetProfile.getId().equals(Util.NIL_UUID)) {
++            return null;
++        }
++
++        // Check cache first if enabled
++        if (org.dreeam.leaf.config.modules.misc.CacheProfileLookup.enabled) {
++            ProfileResult cachedResult = PROFILE_DATA_CACHE.getIfPresent(targetProfile.getId());
++            if (cachedResult != null) {
++                return cachedResult;
++            }
++        }
++
++        // Fetch fresh data from Mojang
++        ProfileResult fetchedResult = server.getSessionService().fetchProfile(targetProfile.getId(), true);
++
++        // Cache the result if caching is enabled and data was fetched successfully
++        if (org.dreeam.leaf.config.modules.misc.CacheProfileLookup.enabled && fetchedResult != null) {
++            PROFILE_DATA_CACHE.put(targetProfile.getId(), fetchedResult);
++        }
++
++        return fetchedResult;
++    }
++
++    @Override
++    public boolean hasTextures() {
++        return this.profile.getProperties().containsKey("textures");
++    }
++    // Leaf end - cache profile data
++
+     private static void copyProfileProperties(GameProfile source, GameProfile target) {
+         copyProfileProperties(source, target, false);
+     }
diff --git a/leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/Cache.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/Cache.java
deleted file mode 100644
index d7d6e7fc..00000000
--- a/leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/Cache.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.dreeam.leaf.config.modules.misc;
-
-import org.dreeam.leaf.config.ConfigModules;
-import org.dreeam.leaf.config.EnumConfigCategory;
-
-public class Cache extends ConfigModules {
-
-    public String getBasePath() {
-        return EnumConfigCategory.MISC.getBaseKeyName() + ".cache";
-    }
-
-    public static boolean cachePlayerProfileResult = false;
-    public static int cachePlayerProfileResultTimeout = 1440;
-
-    @Override
-    public void onLoaded() {
-        cachePlayerProfileResult = config.getBoolean(getBasePath() + ".cache-player-profile-result", cachePlayerProfileResult, config.pickStringRegionBased("""
-                Cache the player profile result on they first join.
-                It's useful if Mojang's verification server is down.""",
-            """
-                玩家首次加入时缓存 PlayerProfile.
-                正版验证服务器宕机时非常有用."""));
-        cachePlayerProfileResultTimeout = config.getInt(getBasePath() + ".cache-player-profile-result-timeout", cachePlayerProfileResultTimeout,
-            config.pickStringRegionBased(
-                "The timeout of the cache. Unit: Minutes.",
-                "缓存过期时间. 单位: 分钟."
-            ));
-    }
-}
diff --git a/leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/CacheProfileLookup.java b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/CacheProfileLookup.java
new file mode 100644
index 00000000..c21c107b
--- /dev/null
+++ b/leaf-server/src/main/java/org/dreeam/leaf/config/modules/misc/CacheProfileLookup.java
@@ -0,0 +1,31 @@
+package org.dreeam.leaf.config.modules.misc;
+
+import org.dreeam.leaf.config.ConfigModules;
+import org.dreeam.leaf.config.EnumConfigCategory;
+
+public class CacheProfileLookup extends ConfigModules {
+
+    public String getBasePath() {
+        return EnumConfigCategory.MISC.getBaseKeyName() + ".cache.profile-lookup";
+    }
+
+    public static boolean enabled = false;
+    public static int timeout = 1440; // 24 hours in minutes
+    public static int maxSize = 8192;
+
+    @Override
+    public void onLoaded() {
+        enabled = config.getBoolean(getBasePath() + ".enabled", enabled, config.pickStringRegionBased("""
+                Cache profile data lookups (skins, textures, etc.) to reduce API calls to Mojang.""",
+            """
+                缓存玩家资料查询 (皮肤, 材质等) 以减少对 Mojang API 的调用."""));
+        timeout = config.getInt(getBasePath() + ".timeout", timeout, config.pickStringRegionBased(
+                "The timeout for profile lookup cache. Unit: Minutes.",
+                "玩家资料查询缓存过期时间. 单位: 分钟. (推荐: 1440 = 24小时)"
+            ));
+        maxSize = config.getInt(getBasePath() + ".max-size", maxSize, config.pickStringRegionBased(
+                "Maximum number of profiles to cache. Higher values use more memory (not that much).",
+                "最大缓存的玩家资料数量. 更高的值会使用更多内存."
+            ));
+    }
+}