diff --git a/leaf-server/minecraft-patches/features/0217-Optimize-addOrUpdateTransientModifier.patch b/leaf-archived-patches/removed/1.21.8/0217-Optimize-addOrUpdateTransientModifier.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0217-Optimize-addOrUpdateTransientModifier.patch rename to leaf-archived-patches/removed/1.21.8/0217-Optimize-addOrUpdateTransientModifier.patch diff --git a/leaf-server/minecraft-patches/features/0218-Optimize-ContextMap.create.patch b/leaf-server/minecraft-patches/features/0217-Optimize-ContextMap.create.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0218-Optimize-ContextMap.create.patch rename to leaf-server/minecraft-patches/features/0217-Optimize-ContextMap.create.patch diff --git a/leaf-server/minecraft-patches/features/0219-Micro-optimizations-for-random-tick.patch b/leaf-server/minecraft-patches/features/0218-Micro-optimizations-for-random-tick.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0219-Micro-optimizations-for-random-tick.patch rename to leaf-server/minecraft-patches/features/0218-Micro-optimizations-for-random-tick.patch diff --git a/leaf-server/minecraft-patches/features/0220-Remove-streams-on-updateConnectedPlayersWithinRange.patch b/leaf-server/minecraft-patches/features/0219-Remove-streams-on-updateConnectedPlayersWithinRange.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0220-Remove-streams-on-updateConnectedPlayersWithinRange.patch rename to leaf-server/minecraft-patches/features/0219-Remove-streams-on-updateConnectedPlayersWithinRange.patch diff --git a/leaf-server/minecraft-patches/features/0221-Remove-streams-on-PlayerDetector.patch b/leaf-server/minecraft-patches/features/0220-Remove-streams-on-PlayerDetector.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0221-Remove-streams-on-PlayerDetector.patch rename to leaf-server/minecraft-patches/features/0220-Remove-streams-on-PlayerDetector.patch diff --git a/leaf-server/minecraft-patches/features/0222-Use-direct-iteration-on-Sensing.tick.patch b/leaf-server/minecraft-patches/features/0221-Use-direct-iteration-on-Sensing.tick.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0222-Use-direct-iteration-on-Sensing.tick.patch rename to leaf-server/minecraft-patches/features/0221-Use-direct-iteration-on-Sensing.tick.patch diff --git a/leaf-server/minecraft-patches/features/0223-Optimise-non-flush-packet-sending.patch b/leaf-server/minecraft-patches/features/0222-Optimise-non-flush-packet-sending.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0223-Optimise-non-flush-packet-sending.patch rename to leaf-server/minecraft-patches/features/0222-Optimise-non-flush-packet-sending.patch diff --git a/leaf-server/minecraft-patches/features/0224-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch b/leaf-server/minecraft-patches/features/0223-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0224-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch rename to leaf-server/minecraft-patches/features/0223-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch index 91c61f15..38f5fbad 100644 --- a/leaf-server/minecraft-patches/features/0224-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch +++ b/leaf-server/minecraft-patches/features/0223-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 317e6ee0cf5c49501cba71b883cae205fb1cd54c..41220d9c74a09515ffa24ff2c9b5979f37fa4c2a 100644 +index 97b55cde60c69b5d306b776a345af4e94f7fab01..f59de7c274a95016a12c3c7314e797eaff3c8ea8 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -4813,10 +4813,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/leaf-server/minecraft-patches/features/0225-Null-handling-on-MultifaceSpreader.patch b/leaf-server/minecraft-patches/features/0224-Null-handling-on-MultifaceSpreader.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0225-Null-handling-on-MultifaceSpreader.patch rename to leaf-server/minecraft-patches/features/0224-Null-handling-on-MultifaceSpreader.patch diff --git a/leaf-server/minecraft-patches/features/0226-More-virtual-threads.patch b/leaf-server/minecraft-patches/features/0225-More-virtual-threads.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0226-More-virtual-threads.patch rename to leaf-server/minecraft-patches/features/0225-More-virtual-threads.patch diff --git a/leaf-server/minecraft-patches/features/0227-Async-target-finding.patch b/leaf-server/minecraft-patches/features/0226-Async-target-finding.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0227-Async-target-finding.patch rename to leaf-server/minecraft-patches/features/0226-Async-target-finding.patch diff --git a/leaf-server/minecraft-patches/features/0228-Optimize-ThreadedTicketLevelPropagator.patch b/leaf-server/minecraft-patches/features/0227-Optimize-ThreadedTicketLevelPropagator.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0228-Optimize-ThreadedTicketLevelPropagator.patch rename to leaf-server/minecraft-patches/features/0227-Optimize-ThreadedTicketLevelPropagator.patch diff --git a/leaf-server/minecraft-patches/features/0229-Optimise-MobEffectUtil-getDigSpeedAmplification.patch b/leaf-server/minecraft-patches/features/0228-Optimise-MobEffectUtil-getDigSpeedAmplification.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0229-Optimise-MobEffectUtil-getDigSpeedAmplification.patch rename to leaf-server/minecraft-patches/features/0228-Optimise-MobEffectUtil-getDigSpeedAmplification.patch diff --git a/leaf-server/minecraft-patches/features/0230-Optimise-chunkUnloads.patch b/leaf-server/minecraft-patches/features/0229-Optimise-chunkUnloads.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0230-Optimise-chunkUnloads.patch rename to leaf-server/minecraft-patches/features/0229-Optimise-chunkUnloads.patch diff --git a/leaf-server/minecraft-patches/features/0231-Optimize-BlockEntityType-isValid.patch b/leaf-server/minecraft-patches/features/0230-Optimize-BlockEntityType-isValid.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0231-Optimize-BlockEntityType-isValid.patch rename to leaf-server/minecraft-patches/features/0230-Optimize-BlockEntityType-isValid.patch diff --git a/leaf-server/minecraft-patches/features/0232-Paper-PR-Add-ticket-on-player-join-to-avoid-chunk-lo.patch b/leaf-server/minecraft-patches/features/0231-Paper-PR-Add-ticket-on-player-join-to-avoid-chunk-lo.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0232-Paper-PR-Add-ticket-on-player-join-to-avoid-chunk-lo.patch rename to leaf-server/minecraft-patches/features/0231-Paper-PR-Add-ticket-on-player-join-to-avoid-chunk-lo.patch diff --git a/leaf-server/minecraft-patches/features/0233-Sakura-copy-EntityList-implementation-to-BasicEntity.patch b/leaf-server/minecraft-patches/features/0232-Sakura-copy-EntityList-implementation-to-BasicEntity.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0233-Sakura-copy-EntityList-implementation-to-BasicEntity.patch rename to leaf-server/minecraft-patches/features/0232-Sakura-copy-EntityList-implementation-to-BasicEntity.patch diff --git a/leaf-server/minecraft-patches/features/0234-Protocol-Core.patch b/leaf-server/minecraft-patches/features/0233-Protocol-Core.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0234-Protocol-Core.patch rename to leaf-server/minecraft-patches/features/0233-Protocol-Core.patch diff --git a/leaf-server/minecraft-patches/features/0235-Async-switch-connection-state.patch b/leaf-server/minecraft-patches/features/0234-Async-switch-connection-state.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0235-Async-switch-connection-state.patch rename to leaf-server/minecraft-patches/features/0234-Async-switch-connection-state.patch diff --git a/leaf-server/minecraft-patches/features/0236-Optimize-BlockEntities-tickersInLevel.patch b/leaf-server/minecraft-patches/features/0235-Optimize-BlockEntities-tickersInLevel.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0236-Optimize-BlockEntities-tickersInLevel.patch rename to leaf-server/minecraft-patches/features/0235-Optimize-BlockEntities-tickersInLevel.patch diff --git a/leaf-server/minecraft-patches/features/0237-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch b/leaf-server/minecraft-patches/features/0236-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0237-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch rename to leaf-server/minecraft-patches/features/0236-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch diff --git a/leaf-server/minecraft-patches/features/0238-Flush-location-while-knockback.patch b/leaf-server/minecraft-patches/features/0237-Flush-location-while-knockback.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0238-Flush-location-while-knockback.patch rename to leaf-server/minecraft-patches/features/0237-Flush-location-while-knockback.patch diff --git a/leaf-server/minecraft-patches/features/0239-Only-tick-items-at-hand.patch b/leaf-server/minecraft-patches/features/0238-Only-tick-items-at-hand.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0239-Only-tick-items-at-hand.patch rename to leaf-server/minecraft-patches/features/0238-Only-tick-items-at-hand.patch diff --git a/leaf-server/minecraft-patches/features/0240-Smart-sort-items-in-NearestItemSensor.patch b/leaf-server/minecraft-patches/features/0239-Smart-sort-items-in-NearestItemSensor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0240-Smart-sort-items-in-NearestItemSensor.patch rename to leaf-server/minecraft-patches/features/0239-Smart-sort-items-in-NearestItemSensor.patch diff --git a/leaf-server/minecraft-patches/features/0241-Optimise-player-movement-checks.patch b/leaf-server/minecraft-patches/features/0240-Optimise-player-movement-checks.patch similarity index 90% rename from leaf-server/minecraft-patches/features/0241-Optimise-player-movement-checks.patch rename to leaf-server/minecraft-patches/features/0240-Optimise-player-movement-checks.patch index 8c1a0dcf..79f8e0cc 100644 --- a/leaf-server/minecraft-patches/features/0241-Optimise-player-movement-checks.patch +++ b/leaf-server/minecraft-patches/features/0240-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 41220d9c74a09515ffa24ff2c9b5979f37fa4c2a..078b194a3e916edabc577debd425298dd7f8d75c 100644 +index f59de7c274a95016a12c3c7314e797eaff3c8ea8..6900aeea3fbff01c3ce5184ee2d74ec8e7b682a2 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -1217,7 +1217,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/leaf-server/minecraft-patches/features/0242-Remove-streams-in-MobSensor.patch b/leaf-server/minecraft-patches/features/0241-Remove-streams-in-MobSensor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0242-Remove-streams-in-MobSensor.patch rename to leaf-server/minecraft-patches/features/0241-Remove-streams-in-MobSensor.patch diff --git a/leaf-server/minecraft-patches/features/0243-Remove-streams-in-TemptingSensor.patch b/leaf-server/minecraft-patches/features/0242-Remove-streams-in-TemptingSensor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0243-Remove-streams-in-TemptingSensor.patch rename to leaf-server/minecraft-patches/features/0242-Remove-streams-in-TemptingSensor.patch diff --git a/leaf-server/minecraft-patches/features/0244-Use-HashedList-on-WeightedList.patch b/leaf-server/minecraft-patches/features/0243-Use-HashedList-on-WeightedList.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0244-Use-HashedList-on-WeightedList.patch rename to leaf-server/minecraft-patches/features/0243-Use-HashedList-on-WeightedList.patch diff --git a/leaf-server/minecraft-patches/features/0245-Add-configurable-death-item-drop-knockback-settings.patch b/leaf-server/minecraft-patches/features/0244-Add-configurable-death-item-drop-knockback-settings.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0245-Add-configurable-death-item-drop-knockback-settings.patch rename to leaf-server/minecraft-patches/features/0244-Add-configurable-death-item-drop-knockback-settings.patch diff --git a/leaf-server/minecraft-patches/features/0246-Optimize-getScaledTrackingDistance.patch b/leaf-server/minecraft-patches/features/0245-Optimize-getScaledTrackingDistance.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0246-Optimize-getScaledTrackingDistance.patch rename to leaf-server/minecraft-patches/features/0245-Optimize-getScaledTrackingDistance.patch diff --git a/leaf-server/minecraft-patches/features/0247-Optimize-SynchedEntityData-packDirty.patch b/leaf-server/minecraft-patches/features/0246-Optimize-SynchedEntityData-packDirty.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0247-Optimize-SynchedEntityData-packDirty.patch rename to leaf-server/minecraft-patches/features/0246-Optimize-SynchedEntityData-packDirty.patch diff --git a/leaf-server/minecraft-patches/features/0248-Optimize-isEyeInFluid.patch b/leaf-server/minecraft-patches/features/0247-Optimize-isEyeInFluid.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0248-Optimize-isEyeInFluid.patch rename to leaf-server/minecraft-patches/features/0247-Optimize-isEyeInFluid.patch index 7da20f4b..41836158 100644 --- a/leaf-server/minecraft-patches/features/0248-Optimize-isEyeInFluid.patch +++ b/leaf-server/minecraft-patches/features/0247-Optimize-isEyeInFluid.patch @@ -92,7 +92,7 @@ index f2ec8dafb133999bed21eb48b118ab5d382bc962..a26943a7c70ac8b8eb3be5cd1f9838e4 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 078b194a3e916edabc577debd425298dd7f8d75c..09dfc36c4491ad6b7e959be678e1d15c48969d04 100644 +index 6900aeea3fbff01c3ce5184ee2d74ec8e7b682a2..863c553d053ae9c6524151112e4477f6f1e52a4c 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/0249-Cache-block-state-tags.patch b/leaf-server/minecraft-patches/features/0248-Cache-block-state-tags.patch similarity index 98% rename from leaf-server/minecraft-patches/features/0249-Cache-block-state-tags.patch rename to leaf-server/minecraft-patches/features/0248-Cache-block-state-tags.patch index 2904252a..a58b4379 100644 --- a/leaf-server/minecraft-patches/features/0249-Cache-block-state-tags.patch +++ b/leaf-server/minecraft-patches/features/0248-Cache-block-state-tags.patch @@ -63,7 +63,7 @@ index 6d522e9485fadd6fc0f350cb30ba5224aa046d4f..9caac78f0dbadc838753e2db7b757b70 return this.owner; } diff --git a/net/minecraft/world/level/pathfinder/PathTypeCache.java b/net/minecraft/world/level/pathfinder/PathTypeCache.java -index 3b190ba2a719cc45045d9be893884b50b9364b58..a64fde6253de1f603d36cd6ef94b9c1da47ba758 100644 +index 3b190ba2a719cc45045d9be893884b50b9364b58..f745b26dd040e7d999beb0a60776504a1333087b 100644 --- a/net/minecraft/world/level/pathfinder/PathTypeCache.java +++ b/net/minecraft/world/level/pathfinder/PathTypeCache.java @@ -24,7 +24,7 @@ public class PathTypeCache { diff --git a/leaf-server/minecraft-patches/features/0250-optimize-getEntityStatus.patch b/leaf-server/minecraft-patches/features/0249-optimize-getEntityStatus.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0250-optimize-getEntityStatus.patch rename to leaf-server/minecraft-patches/features/0249-optimize-getEntityStatus.patch diff --git a/leaf-server/minecraft-patches/features/0251-Rail-Optimization-optimized-PoweredRailBlock-logic.patch b/leaf-server/minecraft-patches/features/0250-Rail-Optimization-optimized-PoweredRailBlock-logic.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0251-Rail-Optimization-optimized-PoweredRailBlock-logic.patch rename to leaf-server/minecraft-patches/features/0250-Rail-Optimization-optimized-PoweredRailBlock-logic.patch diff --git a/leaf-server/minecraft-patches/features/0252-optimise-ChunkGenerator-getMobsAt.patch b/leaf-server/minecraft-patches/features/0251-optimise-ChunkGenerator-getMobsAt.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0252-optimise-ChunkGenerator-getMobsAt.patch rename to leaf-server/minecraft-patches/features/0251-optimise-ChunkGenerator-getMobsAt.patch diff --git a/leaf-server/minecraft-patches/features/0253-cache-getBiome.patch b/leaf-server/minecraft-patches/features/0252-cache-getBiome.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0253-cache-getBiome.patch rename to leaf-server/minecraft-patches/features/0252-cache-getBiome.patch diff --git a/leaf-server/minecraft-patches/features/0254-optimize-mob-spawning.patch b/leaf-server/minecraft-patches/features/0253-optimize-mob-spawning.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0254-optimize-mob-spawning.patch rename to leaf-server/minecraft-patches/features/0253-optimize-mob-spawning.patch diff --git a/leaf-server/minecraft-patches/features/0255-optimize-structure-map.patch b/leaf-server/minecraft-patches/features/0254-optimize-structure-map.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0255-optimize-structure-map.patch rename to leaf-server/minecraft-patches/features/0254-optimize-structure-map.patch diff --git a/leaf-server/minecraft-patches/features/0256-throttle-mob-spawning.patch b/leaf-server/minecraft-patches/features/0255-throttle-mob-spawning.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0256-throttle-mob-spawning.patch rename to leaf-server/minecraft-patches/features/0255-throttle-mob-spawning.patch diff --git a/leaf-server/minecraft-patches/features/0257-Add-BlockExplosionHitEvent.patch b/leaf-server/minecraft-patches/features/0256-Add-BlockExplosionHitEvent.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0257-Add-BlockExplosionHitEvent.patch rename to leaf-server/minecraft-patches/features/0256-Add-BlockExplosionHitEvent.patch diff --git a/leaf-server/minecraft-patches/features/0258-Old-Blast-Protection-explosion-knockback.patch b/leaf-server/minecraft-patches/features/0257-Old-Blast-Protection-explosion-knockback.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0258-Old-Blast-Protection-explosion-knockback.patch rename to leaf-server/minecraft-patches/features/0257-Old-Blast-Protection-explosion-knockback.patch diff --git a/leaf-server/minecraft-patches/features/0259-Use-UUID-for-cure-reputation.patch b/leaf-server/minecraft-patches/features/0258-Use-UUID-for-cure-reputation.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0259-Use-UUID-for-cure-reputation.patch rename to leaf-server/minecraft-patches/features/0258-Use-UUID-for-cure-reputation.patch diff --git a/leaf-server/minecraft-patches/features/0260-Fix-crash-during-parsing-unknown-command-message.patch b/leaf-server/minecraft-patches/features/0259-Fix-crash-during-parsing-unknown-command-message.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0260-Fix-crash-during-parsing-unknown-command-message.patch rename to leaf-server/minecraft-patches/features/0259-Fix-crash-during-parsing-unknown-command-message.patch diff --git a/leaf-server/minecraft-patches/features/0261-optimize-random-tick.patch b/leaf-server/minecraft-patches/features/0260-optimize-random-tick.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0261-optimize-random-tick.patch rename to leaf-server/minecraft-patches/features/0260-optimize-random-tick.patch diff --git a/leaf-server/minecraft-patches/features/0262-do-not-log-invalid-flatten-text-component-parse.patch b/leaf-server/minecraft-patches/features/0261-do-not-log-invalid-flatten-text-component-parse.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0262-do-not-log-invalid-flatten-text-component-parse.patch rename to leaf-server/minecraft-patches/features/0261-do-not-log-invalid-flatten-text-component-parse.patch diff --git a/leaf-server/minecraft-patches/features/0263-Fast-BiomeManager-seed-obfuscation.patch b/leaf-server/minecraft-patches/features/0262-Fast-BiomeManager-seed-obfuscation.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0263-Fast-BiomeManager-seed-obfuscation.patch rename to leaf-server/minecraft-patches/features/0262-Fast-BiomeManager-seed-obfuscation.patch diff --git a/leaf-server/minecraft-patches/features/0264-Replace-EntitySelectorOptions-map-with-optimized-col.patch b/leaf-server/minecraft-patches/features/0263-Replace-EntitySelectorOptions-map-with-optimized-col.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0264-Replace-EntitySelectorOptions-map-with-optimized-col.patch rename to leaf-server/minecraft-patches/features/0263-Replace-EntitySelectorOptions-map-with-optimized-col.patch diff --git a/leaf-server/minecraft-patches/features/0265-optimize-no-action-time.patch b/leaf-server/minecraft-patches/features/0264-optimize-no-action-time.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0265-optimize-no-action-time.patch rename to leaf-server/minecraft-patches/features/0264-optimize-no-action-time.patch diff --git a/leaf-server/minecraft-patches/features/0266-optimize-waypoint.patch b/leaf-server/minecraft-patches/features/0265-optimize-waypoint.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0266-optimize-waypoint.patch rename to leaf-server/minecraft-patches/features/0265-optimize-waypoint.patch index 3ee61ef5..d27252b2 100644 --- a/leaf-server/minecraft-patches/features/0266-optimize-waypoint.patch +++ b/leaf-server/minecraft-patches/features/0265-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 09dfc36c4491ad6b7e959be678e1d15c48969d04..b66d834985b966d3dd0090e1b851baf8d4e3df1c 100644 +index 863c553d053ae9c6524151112e4477f6f1e52a4c..ecd8a497d35186698be39e91e65a63af231d06ed 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -5145,6 +5145,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/leaf-server/minecraft-patches/features/0267-Paw-optimization.patch b/leaf-server/minecraft-patches/features/0266-Paw-optimization.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0267-Paw-optimization.patch rename to leaf-server/minecraft-patches/features/0266-Paw-optimization.patch index b9d875ed..6f7d535a 100644 --- a/leaf-server/minecraft-patches/features/0267-Paw-optimization.patch +++ b/leaf-server/minecraft-patches/features/0266-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 b66d834985b966d3dd0090e1b851baf8d4e3df1c..45067a5ddc8f9421479947f4aa9e5c595bfaeccc 100644 +index ecd8a497d35186698be39e91e65a63af231d06ed..5bb9617b3b5192b78c1851f03e9e952403a2396f 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -1171,16 +1171,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -230,7 +230,7 @@ index 111eb3a1c584ae42e1afb784cfbaa50dc252e91f..be0e229a0b0b531d956cbfcb8184df64 flag = true; break; diff --git a/net/minecraft/world/level/block/FireBlock.java b/net/minecraft/world/level/block/FireBlock.java -index c03ad7be16fbb9f98c28bc09de59bf33d4edf5d7..9fea651771107504fee8ccb1179f454b51d477b8 100644 +index 73ce9594ab12fd54b9be265c2c4adf9f28fb1b21..51dc0aabc60a317b0340ec7770d057d5ac68429f 100644 --- a/net/minecraft/world/level/block/FireBlock.java +++ b/net/minecraft/world/level/block/FireBlock.java @@ -138,7 +138,7 @@ public class FireBlock extends BaseFireBlock { diff --git a/leaf-server/minecraft-patches/features/0268-Fix-Paper-config-fixClimbingBypassingCrammingRule.patch b/leaf-server/minecraft-patches/features/0267-Fix-Paper-config-fixClimbingBypassingCrammingRule.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0268-Fix-Paper-config-fixClimbingBypassingCrammingRule.patch rename to leaf-server/minecraft-patches/features/0267-Fix-Paper-config-fixClimbingBypassingCrammingRule.patch diff --git a/leaf-server/minecraft-patches/features/0269-Skip-inactive-entity-for-execute.patch b/leaf-server/minecraft-patches/features/0268-Skip-inactive-entity-for-execute.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0269-Skip-inactive-entity-for-execute.patch rename to leaf-server/minecraft-patches/features/0268-Skip-inactive-entity-for-execute.patch diff --git a/leaf-server/minecraft-patches/features/0270-Optimise-getEntities.patch b/leaf-server/minecraft-patches/features/0269-Optimise-getEntities.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0270-Optimise-getEntities.patch rename to leaf-server/minecraft-patches/features/0269-Optimise-getEntities.patch diff --git a/leaf-server/minecraft-patches/features/0271-fix-MC-298464.patch b/leaf-server/minecraft-patches/features/0270-fix-MC-298464.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0271-fix-MC-298464.patch rename to leaf-server/minecraft-patches/features/0270-fix-MC-298464.patch diff --git a/leaf-server/minecraft-patches/features/0272-Re-route-SetClosestHomeAsWalkTarget-s-poi-finding-to.patch b/leaf-server/minecraft-patches/features/0271-Re-route-SetClosestHomeAsWalkTarget-s-poi-finding-to.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0272-Re-route-SetClosestHomeAsWalkTarget-s-poi-finding-to.patch rename to leaf-server/minecraft-patches/features/0271-Re-route-SetClosestHomeAsWalkTarget-s-poi-finding-to.patch diff --git a/leaf-server/minecraft-patches/features/0273-optimize-checkInsideBlocks-calls.patch b/leaf-server/minecraft-patches/features/0272-optimize-checkInsideBlocks-calls.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0273-optimize-checkInsideBlocks-calls.patch rename to leaf-server/minecraft-patches/features/0272-optimize-checkInsideBlocks-calls.patch index e78ad00f..db099152 100644 --- a/leaf-server/minecraft-patches/features/0273-optimize-checkInsideBlocks-calls.patch +++ b/leaf-server/minecraft-patches/features/0272-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 45067a5ddc8f9421479947f4aa9e5c595bfaeccc..49bd5ee0e739d084b514f704ed4006922fcf0201 100644 +index 5bb9617b3b5192b78c1851f03e9e952403a2396f..72c9c235bf900b59fdd84d6d665e2a525577b1d0 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -1734,8 +1734,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/leaf-server/minecraft-patches/features/0274-Op-lock.patch b/leaf-server/minecraft-patches/features/0273-Op-lock.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0274-Op-lock.patch rename to leaf-server/minecraft-patches/features/0273-Op-lock.patch diff --git a/leaf-server/minecraft-patches/features/0275-Custom-NonNullList.patch b/leaf-server/minecraft-patches/features/0274-Custom-NonNullList.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0275-Custom-NonNullList.patch rename to leaf-server/minecraft-patches/features/0274-Custom-NonNullList.patch diff --git a/leaf-server/minecraft-patches/features/0276-Optimise-TextColor.patch b/leaf-server/minecraft-patches/features/0275-Optimise-TextColor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0276-Optimise-TextColor.patch rename to leaf-server/minecraft-patches/features/0275-Optimise-TextColor.patch diff --git a/leaf-server/minecraft-patches/features/0277-Do-not-create-fire-if-explosion-was-cancelled.patch b/leaf-server/minecraft-patches/features/0276-Do-not-create-fire-if-explosion-was-cancelled.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0277-Do-not-create-fire-if-explosion-was-cancelled.patch rename to leaf-server/minecraft-patches/features/0276-Do-not-create-fire-if-explosion-was-cancelled.patch diff --git a/leaf-server/minecraft-patches/features/0278-Skip-BlockPhysicsEvent-if-no-listeners.patch b/leaf-server/minecraft-patches/features/0277-Skip-BlockPhysicsEvent-if-no-listeners.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0278-Skip-BlockPhysicsEvent-if-no-listeners.patch rename to leaf-server/minecraft-patches/features/0277-Skip-BlockPhysicsEvent-if-no-listeners.patch diff --git a/leaf-server/minecraft-patches/features/0279-Lithium-equipment-tracking.patch b/leaf-server/minecraft-patches/features/0278-Lithium-equipment-tracking.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0279-Lithium-equipment-tracking.patch rename to leaf-server/minecraft-patches/features/0278-Lithium-equipment-tracking.patch index be7d47ed..f4370285 100644 --- a/leaf-server/minecraft-patches/features/0279-Lithium-equipment-tracking.patch +++ b/leaf-server/minecraft-patches/features/0278-Lithium-equipment-tracking.patch @@ -241,7 +241,7 @@ index 90814ad07a2686c5a274860395f5aca29cc3bf13..94c7ae9535a235abb8fddf0ca6578dfa + } } diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index a55b1534dc3c0745ff569f5c1e07dbeaba0fe57d..089cac94935865039cea04485560f42c4909689c 100644 +index 1dbfbb0e56757c0ab6785755afc485055a87c327..862d4f62c73e8e488acb4ec5fff388990ca56083 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -431,7 +431,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin diff --git a/leaf-server/minecraft-patches/features/0280-fix-purpur-attribute-base-patch.patch b/leaf-server/minecraft-patches/features/0279-fix-purpur-attribute-base-patch.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0280-fix-purpur-attribute-base-patch.patch rename to leaf-server/minecraft-patches/features/0279-fix-purpur-attribute-base-patch.patch