diff --git a/leaf-server/minecraft-patches/features/0069-Optimize-player-list-for-sending-player-info.patch b/leaf-archived-patches/removed/1.21.8/mcserver/0069-Optimize-player-list-for-sending-player-info.patch
similarity index 88%
rename from leaf-server/minecraft-patches/features/0069-Optimize-player-list-for-sending-player-info.patch
rename to leaf-archived-patches/removed/1.21.8/mcserver/0069-Optimize-player-list-for-sending-player-info.patch
index 9879cb91..7e10a06a 100644
--- a/leaf-server/minecraft-patches/features/0069-Optimize-player-list-for-sending-player-info.patch
+++ b/leaf-archived-patches/removed/1.21.8/mcserver/0069-Optimize-player-list-for-sending-player-info.patch
@@ -3,6 +3,14 @@ From: Martijn Muijsers <martijnmuijsers@live.nl>
 Date: Tue, 29 Nov 2022 23:30:38 +0100
 Subject: [PATCH] Optimize player list for sending player info
 
+Removed since Leaf 1.21.8, performance regression.
+Originally vanilla logic is to use stream, and Mojang switched it to Guava's Collections2
+since 1.21.4. It is much faster than using stream or manually adding to a new ArrayList.
+Manually adding to a new ArrayList requires allocating a new object array. However, the Collections2
+lazy handles filter condition on iteration, so much better.
+
+The JMH benchmark of this patch can be found in SunBox's `CollectListWithCondition`
+
 License: MIT (https://opensource.org/licenses/MIT)
 Gale - https://galemc.org
 
diff --git a/leaf-server/minecraft-patches/features/0070-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/leaf-server/minecraft-patches/features/0069-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0070-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
rename to leaf-server/minecraft-patches/features/0069-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
diff --git a/leaf-server/minecraft-patches/features/0071-Send-multiple-keep-alive-packets.patch b/leaf-server/minecraft-patches/features/0070-Send-multiple-keep-alive-packets.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0071-Send-multiple-keep-alive-packets.patch
rename to leaf-server/minecraft-patches/features/0070-Send-multiple-keep-alive-packets.patch
diff --git a/leaf-server/minecraft-patches/features/0072-Make-slow-login-timeout-configurable.patch b/leaf-server/minecraft-patches/features/0071-Make-slow-login-timeout-configurable.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0072-Make-slow-login-timeout-configurable.patch
rename to leaf-server/minecraft-patches/features/0071-Make-slow-login-timeout-configurable.patch
diff --git a/leaf-server/minecraft-patches/features/0073-Don-t-load-chunks-to-spawn-phantoms.patch b/leaf-server/minecraft-patches/features/0072-Don-t-load-chunks-to-spawn-phantoms.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0073-Don-t-load-chunks-to-spawn-phantoms.patch
rename to leaf-server/minecraft-patches/features/0072-Don-t-load-chunks-to-spawn-phantoms.patch
diff --git a/leaf-server/minecraft-patches/features/0074-Don-t-load-chunks-to-activate-climbing-entities.patch b/leaf-server/minecraft-patches/features/0073-Don-t-load-chunks-to-activate-climbing-entities.patch
similarity index 94%
rename from leaf-server/minecraft-patches/features/0074-Don-t-load-chunks-to-activate-climbing-entities.patch
rename to leaf-server/minecraft-patches/features/0073-Don-t-load-chunks-to-activate-climbing-entities.patch
index 6d1047b8..ccca986e 100644
--- a/leaf-server/minecraft-patches/features/0074-Don-t-load-chunks-to-activate-climbing-entities.patch
+++ b/leaf-server/minecraft-patches/features/0073-Don-t-load-chunks-to-activate-climbing-entities.patch
@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 79c88dae33c0b1f27064d388e4c6ec7501d3313e..fa6a565e308cdf356855172621dcd7d8c3237403 100644
+index b5b3b705cd23aa3e71c09ab92ed7b446e42a6dca..e42938238c798db6fe2e71eec9afb5d8e28fd6cb 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -4873,6 +4873,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -28,7 +28,7 @@ index 79c88dae33c0b1f27064d388e4c6ec7501d3313e..fa6a565e308cdf356855172621dcd7d8
          return this.chunkPosition;
      }
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 80e250ce17f315ddaa783624413397f56b52f5b9..ae2e0afb0c36fc5512dcea3d15997a737e91de11 100644
+index a8cc23bf13883bd85209e7ae280e476e01a452a9..d20bba53f8616e5093babad0c52d2e4f9b3401f7 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -2129,8 +2129,17 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
diff --git a/leaf-server/minecraft-patches/features/0075-Broadcast-crit-animations-as-the-entity-being-critte.patch b/leaf-server/minecraft-patches/features/0074-Broadcast-crit-animations-as-the-entity-being-critte.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0075-Broadcast-crit-animations-as-the-entity-being-critte.patch
rename to leaf-server/minecraft-patches/features/0074-Broadcast-crit-animations-as-the-entity-being-critte.patch
diff --git a/leaf-server/minecraft-patches/features/0076-Ignore-null-legacy-structure-data.patch b/leaf-server/minecraft-patches/features/0075-Ignore-null-legacy-structure-data.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0076-Ignore-null-legacy-structure-data.patch
rename to leaf-server/minecraft-patches/features/0075-Ignore-null-legacy-structure-data.patch
diff --git a/leaf-server/minecraft-patches/features/0077-Prevent-entities-random-strolling-into-non-ticking-c.patch b/leaf-server/minecraft-patches/features/0076-Prevent-entities-random-strolling-into-non-ticking-c.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0077-Prevent-entities-random-strolling-into-non-ticking-c.patch
rename to leaf-server/minecraft-patches/features/0076-Prevent-entities-random-strolling-into-non-ticking-c.patch
diff --git a/leaf-server/minecraft-patches/features/0078-Do-not-place-player-in-world-if-kicked-before-being-.patch b/leaf-server/minecraft-patches/features/0077-Do-not-place-player-in-world-if-kicked-before-being-.patch
similarity index 94%
rename from leaf-server/minecraft-patches/features/0078-Do-not-place-player-in-world-if-kicked-before-being-.patch
rename to leaf-server/minecraft-patches/features/0077-Do-not-place-player-in-world-if-kicked-before-being-.patch
index 709a81fc..8175c983 100644
--- a/leaf-server/minecraft-patches/features/0078-Do-not-place-player-in-world-if-kicked-before-being-.patch
+++ b/leaf-server/minecraft-patches/features/0077-Do-not-place-player-in-world-if-kicked-before-being-.patch
@@ -14,7 +14,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 7dd599e229329aa3fad772a875688abba6bf7101..92b92476835d6de2a5db89529d58fd0b3067bac6 100644
+index 366d476730923c70f6734e12b21ba3d7f9750643..adc430c3f36bda2d77b76ae7735ce4fe12e33974 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -236,6 +236,13 @@ public abstract class PlayerList {
diff --git a/leaf-server/minecraft-patches/features/0079-Global-EULA-file.patch b/leaf-server/minecraft-patches/features/0078-Global-EULA-file.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0079-Global-EULA-file.patch
rename to leaf-server/minecraft-patches/features/0078-Global-EULA-file.patch
diff --git a/leaf-server/minecraft-patches/features/0080-5-second-TPS-average.patch b/leaf-server/minecraft-patches/features/0079-5-second-TPS-average.patch
similarity index 96%
rename from leaf-server/minecraft-patches/features/0080-5-second-TPS-average.patch
rename to leaf-server/minecraft-patches/features/0079-5-second-TPS-average.patch
index 45075b44..24552a11 100644
--- a/leaf-server/minecraft-patches/features/0080-5-second-TPS-average.patch
+++ b/leaf-server/minecraft-patches/features/0079-5-second-TPS-average.patch
@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 470e9f7570d1fa6b1328052e59ecd1324ec58825..fb998898c33ee5ab48c0858a7487fa41492d2c45 100644
+index 606d63577a241e3ea26ae24be903a91d03ef73c8..94cd410cde9bb4d09c30bd31046184846ee3503d 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -1094,6 +1094,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/leaf-server/minecraft-patches/features/0081-Measure-last-tick-time.patch b/leaf-server/minecraft-patches/features/0080-Measure-last-tick-time.patch
similarity index 97%
rename from leaf-server/minecraft-patches/features/0081-Measure-last-tick-time.patch
rename to leaf-server/minecraft-patches/features/0080-Measure-last-tick-time.patch
index a8c3efe2..3a6f153c 100644
--- a/leaf-server/minecraft-patches/features/0081-Measure-last-tick-time.patch
+++ b/leaf-server/minecraft-patches/features/0080-Measure-last-tick-time.patch
@@ -23,7 +23,7 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index fb998898c33ee5ab48c0858a7487fa41492d2c45..8ca0b06c7eafc9d76311a186a971af09e1674f81 100644
+index 94cd410cde9bb4d09c30bd31046184846ee3503d..e5a10873e2ee8e4f75861eee46dec16c701c086f 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -1141,6 +1141,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/leaf-server/minecraft-patches/features/0082-Increase-time-statistics-in-intervals.patch b/leaf-server/minecraft-patches/features/0081-Increase-time-statistics-in-intervals.patch
similarity index 98%
rename from leaf-server/minecraft-patches/features/0082-Increase-time-statistics-in-intervals.patch
rename to leaf-server/minecraft-patches/features/0081-Increase-time-statistics-in-intervals.patch
index d43abfac..48ba30cf 100644
--- a/leaf-server/minecraft-patches/features/0082-Increase-time-statistics-in-intervals.patch
+++ b/leaf-server/minecraft-patches/features/0081-Increase-time-statistics-in-intervals.patch
@@ -45,7 +45,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
-index 5e01ae7c5d11777868d72589019ad11305c9acdd..1610ef636a0d93c1e07bad9e82ac4d9982c4e854 100644
+index 6207ffb19f8d98ea6496e4d80495bf590b1be7ca..76b35938176a592beb8d490e11cf9970e5d09405 100644
 --- a/net/minecraft/world/entity/player/Player.java
 +++ b/net/minecraft/world/entity/player/Player.java
 @@ -166,6 +166,7 @@ public abstract class Player extends LivingEntity {
diff --git a/leaf-server/minecraft-patches/features/0083-For-collision-check-has-physics-before-same-vehicle.patch b/leaf-server/minecraft-patches/features/0082-For-collision-check-has-physics-before-same-vehicle.patch
similarity index 94%
rename from leaf-server/minecraft-patches/features/0083-For-collision-check-has-physics-before-same-vehicle.patch
rename to leaf-server/minecraft-patches/features/0082-For-collision-check-has-physics-before-same-vehicle.patch
index 294f51f5..6fb83a37 100644
--- a/leaf-server/minecraft-patches/features/0083-For-collision-check-has-physics-before-same-vehicle.patch
+++ b/leaf-server/minecraft-patches/features/0082-For-collision-check-has-physics-before-same-vehicle.patch
@@ -16,7 +16,7 @@ As part of: Akarin (https://github.com/Akarin-project/Akarin)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 41279a276622062338bef685491cc2959ecb2ff4..4a18c7d890cc10d5bb31610df62d20e80bf87aca 100644
+index e42938238c798db6fe2e71eec9afb5d8e28fd6cb..0966cc6911d8b62ac82e42d17931ee614d11ea5a 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -2231,8 +2231,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/leaf-server/minecraft-patches/features/0084-Skip-negligible-planar-movement-multiplication.patch b/leaf-server/minecraft-patches/features/0083-Skip-negligible-planar-movement-multiplication.patch
similarity index 94%
rename from leaf-server/minecraft-patches/features/0084-Skip-negligible-planar-movement-multiplication.patch
rename to leaf-server/minecraft-patches/features/0083-Skip-negligible-planar-movement-multiplication.patch
index 67cf26bc..275d37a2 100644
--- a/leaf-server/minecraft-patches/features/0084-Skip-negligible-planar-movement-multiplication.patch
+++ b/leaf-server/minecraft-patches/features/0083-Skip-negligible-planar-movement-multiplication.patch
@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 4a18c7d890cc10d5bb31610df62d20e80bf87aca..96341ee17591135d77d78c94814313b66eed4c3d 100644
+index 0966cc6911d8b62ac82e42d17931ee614d11ea5a..85424913110a8a5e2059d767cf595a340e41ce37 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -1218,8 +1218,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/leaf-server/minecraft-patches/features/0085-Optimize-matching-item-checks.patch b/leaf-server/minecraft-patches/features/0084-Optimize-matching-item-checks.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0085-Optimize-matching-item-checks.patch
rename to leaf-server/minecraft-patches/features/0084-Optimize-matching-item-checks.patch
diff --git a/leaf-server/minecraft-patches/features/0086-Pre-compute-VarLong-sizes.patch b/leaf-server/minecraft-patches/features/0085-Pre-compute-VarLong-sizes.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0086-Pre-compute-VarLong-sizes.patch
rename to leaf-server/minecraft-patches/features/0085-Pre-compute-VarLong-sizes.patch
diff --git a/leaf-server/minecraft-patches/features/0087-Optimize-VarInt-write-and-VarLong-write.patch b/leaf-server/minecraft-patches/features/0086-Optimize-VarInt-write-and-VarLong-write.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0087-Optimize-VarInt-write-and-VarLong-write.patch
rename to leaf-server/minecraft-patches/features/0086-Optimize-VarInt-write-and-VarLong-write.patch
diff --git a/leaf-server/minecraft-patches/features/0088-Reduce-RandomSource-instances.patch b/leaf-server/minecraft-patches/features/0087-Reduce-RandomSource-instances.patch
similarity index 98%
rename from leaf-server/minecraft-patches/features/0088-Reduce-RandomSource-instances.patch
rename to leaf-server/minecraft-patches/features/0087-Reduce-RandomSource-instances.patch
index 1b56313e..a99996c0 100644
--- a/leaf-server/minecraft-patches/features/0088-Reduce-RandomSource-instances.patch
+++ b/leaf-server/minecraft-patches/features/0087-Reduce-RandomSource-instances.patch
@@ -26,7 +26,7 @@ index 92a820d48057ffe2ef35919341b6cdf605ca939e..b9b1bf351070cd2a744cdb683974fb2a
              double d1 = center.y - maxRange;
              double d2 = center.x + maxRange;
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index bbe123fd18fe97ae93bf562f32af73cdde722f70..feb4f7c70220e9c48a17a815631298bcb8366ded 100644
+index ee2671510d46a92732934cd5df0a0e42c4cae1f6..f68b92a85b2223d22cb96ee0f8d588af5696b947 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -496,7 +496,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
diff --git a/leaf-server/minecraft-patches/features/0089-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch b/leaf-server/minecraft-patches/features/0088-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch
similarity index 96%
rename from leaf-server/minecraft-patches/features/0089-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch
rename to leaf-server/minecraft-patches/features/0088-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch
index f74f4b9f..605fcd73 100644
--- a/leaf-server/minecraft-patches/features/0089-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch
+++ b/leaf-server/minecraft-patches/features/0088-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch
@@ -18,7 +18,7 @@ this patch is focused around the sensors used for ai
 delete the line of sight cache less often and use a faster nearby comparison
 
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index bc284bbd3d601b1e7c15f663cb65b85c24d85a41..fd775ce9a6ca84ce348d929f75f019581a437ea4 100644
+index d20bba53f8616e5093babad0c52d2e4f9b3401f7..da46c16d9ce8c66ce02133d74b2a41f375398528 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -1033,15 +1033,16 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
diff --git a/leaf-server/minecraft-patches/features/0090-Initialize-line-of-sight-cache-with-low-capacity.patch b/leaf-server/minecraft-patches/features/0089-Initialize-line-of-sight-cache-with-low-capacity.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0090-Initialize-line-of-sight-cache-with-low-capacity.patch
rename to leaf-server/minecraft-patches/features/0089-Initialize-line-of-sight-cache-with-low-capacity.patch
diff --git a/leaf-server/minecraft-patches/features/0091-Reduce-line-of-sight-updates-and-cache-lookups.patch b/leaf-server/minecraft-patches/features/0090-Reduce-line-of-sight-updates-and-cache-lookups.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0091-Reduce-line-of-sight-updates-and-cache-lookups.patch
rename to leaf-server/minecraft-patches/features/0090-Reduce-line-of-sight-updates-and-cache-lookups.patch
diff --git a/leaf-server/minecraft-patches/features/0092-Pufferfish-Optimize-mob-spawning.patch b/leaf-server/minecraft-patches/features/0091-Pufferfish-Optimize-mob-spawning.patch
similarity index 99%
rename from leaf-server/minecraft-patches/features/0092-Pufferfish-Optimize-mob-spawning.patch
rename to leaf-server/minecraft-patches/features/0091-Pufferfish-Optimize-mob-spawning.patch
index cf1ad556..3526ef0b 100644
--- a/leaf-server/minecraft-patches/features/0092-Pufferfish-Optimize-mob-spawning.patch
+++ b/leaf-server/minecraft-patches/features/0091-Pufferfish-Optimize-mob-spawning.patch
@@ -22,7 +22,7 @@ and, in my opinion, worth the low risk of minor mob-spawning-related
 inconsistencies.
 
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 8ca0b06c7eafc9d76311a186a971af09e1674f81..4119cfb1de8bbb0c5c1287f70cffc6660dc9e8e4 100644
+index e5a10873e2ee8e4f75861eee46dec16c701c086f..47e714fc564898f9a04a89a6b1b72f4c3adce2a0 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -286,6 +286,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/leaf-server/minecraft-patches/features/0093-Pufferfish-Dynamic-Activation-of-Brain.patch b/leaf-server/minecraft-patches/features/0092-Pufferfish-Dynamic-Activation-of-Brain.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0093-Pufferfish-Dynamic-Activation-of-Brain.patch
rename to leaf-server/minecraft-patches/features/0092-Pufferfish-Dynamic-Activation-of-Brain.patch
diff --git a/leaf-server/minecraft-patches/features/0094-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/leaf-server/minecraft-patches/features/0093-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0094-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch
rename to leaf-server/minecraft-patches/features/0093-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch
diff --git a/leaf-server/minecraft-patches/features/0095-Purpur-Server-Minecraft-Changes.patch b/leaf-server/minecraft-patches/features/0094-Purpur-Server-Minecraft-Changes.patch
similarity index 99%
rename from leaf-server/minecraft-patches/features/0095-Purpur-Server-Minecraft-Changes.patch
rename to leaf-server/minecraft-patches/features/0094-Purpur-Server-Minecraft-Changes.patch
index 5506d4c9..375930d5 100644
--- a/leaf-server/minecraft-patches/features/0095-Purpur-Server-Minecraft-Changes.patch
+++ b/leaf-server/minecraft-patches/features/0094-Purpur-Server-Minecraft-Changes.patch
@@ -492,7 +492,7 @@ index 9da9ab3b835a8dcc7e1da286be1de88a3f0240fa..4b8c9aaf1d143bc38f52f646e4e73b56
  
          for (ServerPlayer serverPlayer : players) {
 diff --git a/net/minecraft/server/commands/GiveCommand.java b/net/minecraft/server/commands/GiveCommand.java
-index adba92a9ebef64561147427d1339f70e2701d93c..cbe614bb66679f9bda3ecb13a034432fbac7317d 100644
+index 4f56cdcf658234b1ca92d38c3df3d31e9be34a15..945d7c0b31fe9ac029e518af92eebd6e8018a69f 100644
 --- a/net/minecraft/server/commands/GiveCommand.java
 +++ b/net/minecraft/server/commands/GiveCommand.java
 @@ -69,6 +69,7 @@ public class GiveCommand {
@@ -1570,7 +1570,7 @@ index f9fad100d3e5e4b44a5b0f88e288e6fac7a250f7..6d320ed179393e47398c44f2ba2b2285
                      }
                  } catch (AuthenticationUnavailableException var4) {
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 3d9301b68825a2be4ff6798bcf6e63d3c48908f5..f66425af98a38c1bbb11c52de96839faf42e26d0 100644
+index adc430c3f36bda2d77b76ae7735ce4fe12e33974..6396083993d248683b887774d2db3f3f03825033 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -412,6 +412,7 @@ public abstract class PlayerList {
@@ -1589,7 +1589,7 @@ index 3d9301b68825a2be4ff6798bcf6e63d3c48908f5..f66425af98a38c1bbb11c52de96839fa
          ServerLevel serverLevel = player.level();
          player.awardStat(Stats.LEAVE_GAME);
          // CraftBukkit start - Quitting must be before we do final save of data, in case plugins need to modify it
-@@ -962,6 +964,20 @@ public abstract class PlayerList {
+@@ -953,6 +955,20 @@ public abstract class PlayerList {
          }
      }
  
@@ -1610,7 +1610,7 @@ index 3d9301b68825a2be4ff6798bcf6e63d3c48908f5..f66425af98a38c1bbb11c52de96839fa
      public void broadcastAll(Packet<?> packet, ResourceKey<Level> dimension) {
          for (ServerPlayer serverPlayer : this.players) {
              if (serverPlayer.level().dimension() == dimension) {
-@@ -1046,6 +1062,7 @@ public abstract class PlayerList {
+@@ -1037,6 +1053,7 @@ public abstract class PlayerList {
              } else {
                  b = (byte)(24 + permLevel);
              }
@@ -1618,7 +1618,7 @@ index 3d9301b68825a2be4ff6798bcf6e63d3c48908f5..f66425af98a38c1bbb11c52de96839fa
  
              player.connection.send(new ClientboundEntityEventPacket(player, b));
          }
-@@ -1054,11 +1071,32 @@ public abstract class PlayerList {
+@@ -1045,11 +1062,32 @@ public abstract class PlayerList {
          player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
          this.server.getCommands().sendCommands(player);
          } // Paper - Add sendOpLevel API
diff --git a/leaf-server/minecraft-patches/features/0096-Fix-Pufferfish-and-Purpur-patches.patch b/leaf-server/minecraft-patches/features/0095-Fix-Pufferfish-and-Purpur-patches.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0096-Fix-Pufferfish-and-Purpur-patches.patch
rename to leaf-server/minecraft-patches/features/0095-Fix-Pufferfish-and-Purpur-patches.patch
diff --git a/leaf-server/minecraft-patches/features/0097-Purpur-Configurable-server-mod-name.patch b/leaf-server/minecraft-patches/features/0096-Purpur-Configurable-server-mod-name.patch
similarity index 90%
rename from leaf-server/minecraft-patches/features/0097-Purpur-Configurable-server-mod-name.patch
rename to leaf-server/minecraft-patches/features/0096-Purpur-Configurable-server-mod-name.patch
index e39c8a6c..4da091f1 100644
--- a/leaf-server/minecraft-patches/features/0097-Purpur-Configurable-server-mod-name.patch
+++ b/leaf-server/minecraft-patches/features/0096-Purpur-Configurable-server-mod-name.patch
@@ -7,7 +7,7 @@ Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 19e65eaf77dd8fa5eaa23e4db9af1adee7280fff..12e697a626ce68127ac2157fca0e5408beb13f0b 100644
+index b4c4e18e27fd2f520c122cf3418c8861e60d90ab..7b4437c06c2ede0be7dd58b42863e88b4b205106 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -1840,7 +1840,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/leaf-server/minecraft-patches/features/0098-Configurable-server-GUI-name.patch b/leaf-server/minecraft-patches/features/0097-Configurable-server-GUI-name.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0098-Configurable-server-GUI-name.patch
rename to leaf-server/minecraft-patches/features/0097-Configurable-server-GUI-name.patch
diff --git a/leaf-server/minecraft-patches/features/0099-Remove-vanilla-username-check.patch b/leaf-server/minecraft-patches/features/0098-Remove-vanilla-username-check.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0099-Remove-vanilla-username-check.patch
rename to leaf-server/minecraft-patches/features/0098-Remove-vanilla-username-check.patch
diff --git a/leaf-server/minecraft-patches/features/0100-Remove-Spigot-check-for-broken-BungeeCord-configurat.patch b/leaf-server/minecraft-patches/features/0099-Remove-Spigot-check-for-broken-BungeeCord-configurat.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0100-Remove-Spigot-check-for-broken-BungeeCord-configurat.patch
rename to leaf-server/minecraft-patches/features/0099-Remove-Spigot-check-for-broken-BungeeCord-configurat.patch
diff --git a/leaf-server/minecraft-patches/features/0101-Remove-UseItemOnPacket-Too-Far-check.patch b/leaf-server/minecraft-patches/features/0100-Remove-UseItemOnPacket-Too-Far-check.patch
similarity index 95%
rename from leaf-server/minecraft-patches/features/0101-Remove-UseItemOnPacket-Too-Far-check.patch
rename to leaf-server/minecraft-patches/features/0100-Remove-UseItemOnPacket-Too-Far-check.patch
index e5d92657..36e0fc1d 100644
--- a/leaf-server/minecraft-patches/features/0101-Remove-UseItemOnPacket-Too-Far-check.patch
+++ b/leaf-server/minecraft-patches/features/0100-Remove-UseItemOnPacket-Too-Far-check.patch
@@ -7,7 +7,7 @@ This Check is added in 1.17.x -> 1.18.x that updated by Mojang.
 By removing this check, it gives ability for hackers to use some modules of hack clients.
 
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 53200e2f90d76a54254f819a2f419e298975a367..1fda5f9d285a51fd642369b4cc32826c38019c69 100644
+index a0941c15a9391f85af9fcb3784c66514b314f4dc..f20cb459f83f870e1c04ed1d83eee885619dfe57 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2122,8 +2122,13 @@ public class ServerGamePacketListenerImpl
diff --git a/leaf-server/minecraft-patches/features/0102-Remove-change-non-editable-sign-warning.patch b/leaf-server/minecraft-patches/features/0101-Remove-change-non-editable-sign-warning.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0102-Remove-change-non-editable-sign-warning.patch
rename to leaf-server/minecraft-patches/features/0101-Remove-change-non-editable-sign-warning.patch
diff --git a/leaf-server/minecraft-patches/features/0103-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch b/leaf-server/minecraft-patches/features/0102-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0103-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch
rename to leaf-server/minecraft-patches/features/0102-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch
diff --git a/leaf-server/minecraft-patches/features/0104-Carpet-Fixes-Optimized-getBiome-method.patch b/leaf-server/minecraft-patches/features/0103-Carpet-Fixes-Optimized-getBiome-method.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0104-Carpet-Fixes-Optimized-getBiome-method.patch
rename to leaf-server/minecraft-patches/features/0103-Carpet-Fixes-Optimized-getBiome-method.patch
diff --git a/leaf-server/minecraft-patches/features/0105-Carpet-Fixes-Use-optimized-RecipeManager.patch b/leaf-server/minecraft-patches/features/0104-Carpet-Fixes-Use-optimized-RecipeManager.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0105-Carpet-Fixes-Use-optimized-RecipeManager.patch
rename to leaf-server/minecraft-patches/features/0104-Carpet-Fixes-Use-optimized-RecipeManager.patch
diff --git a/leaf-server/minecraft-patches/features/0106-Akarin-Save-Json-list-asynchronously.patch b/leaf-server/minecraft-patches/features/0105-Akarin-Save-Json-list-asynchronously.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0106-Akarin-Save-Json-list-asynchronously.patch
rename to leaf-server/minecraft-patches/features/0105-Akarin-Save-Json-list-asynchronously.patch
diff --git a/leaf-server/minecraft-patches/features/0107-Slice-Smooth-Teleports.patch b/leaf-server/minecraft-patches/features/0106-Slice-Smooth-Teleports.patch
similarity index 97%
rename from leaf-server/minecraft-patches/features/0107-Slice-Smooth-Teleports.patch
rename to leaf-server/minecraft-patches/features/0106-Slice-Smooth-Teleports.patch
index b73d5a17..de0fa881 100644
--- a/leaf-server/minecraft-patches/features/0107-Slice-Smooth-Teleports.patch
+++ b/leaf-server/minecraft-patches/features/0106-Slice-Smooth-Teleports.patch
@@ -21,7 +21,7 @@ index fb585637383db4592f97f0c9040ffa86afb43c6a..880bf83929e636872eeb53c5c3ec9357
      // Paper start - rewrite chunk system
      private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index f66425af98a38c1bbb11c52de96839faf42e26d0..97c12b55bec58ba63bd6dbe338944637dc8fc844 100644
+index 6396083993d248683b887774d2db3f3f03825033..c315655501aa79333c4a1c5b58382f186df5f7a1 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -759,11 +759,11 @@ public abstract class PlayerList {
diff --git a/leaf-server/minecraft-patches/features/0108-Parchment-Make-FixLight-use-action-bar.patch b/leaf-server/minecraft-patches/features/0107-Parchment-Make-FixLight-use-action-bar.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0108-Parchment-Make-FixLight-use-action-bar.patch
rename to leaf-server/minecraft-patches/features/0107-Parchment-Make-FixLight-use-action-bar.patch
diff --git a/leaf-server/minecraft-patches/features/0109-Leaves-Protocol-Core.patch b/leaf-server/minecraft-patches/features/0108-Leaves-Protocol-Core.patch
similarity index 98%
rename from leaf-server/minecraft-patches/features/0109-Leaves-Protocol-Core.patch
rename to leaf-server/minecraft-patches/features/0108-Leaves-Protocol-Core.patch
index f5312be2..76712d96 100644
--- a/leaf-server/minecraft-patches/features/0109-Leaves-Protocol-Core.patch
+++ b/leaf-server/minecraft-patches/features/0108-Leaves-Protocol-Core.patch
@@ -97,7 +97,7 @@ index ca9ba2a2535eab66622230778efdf941f540f6d2..fa6095200243fafa796e49df3930c6d7
              bridge.removeChannel(channel);
          }
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 97c12b55bec58ba63bd6dbe338944637dc8fc844..100d121d2c26d7c21669d90f416f40a344c12bb9 100644
+index c315655501aa79333c4a1c5b58382f186df5f7a1..8724b03cbe22492c17d8d8c60fbd06d60a32925a 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -346,6 +346,8 @@ public abstract class PlayerList {
@@ -117,7 +117,7 @@ index 97c12b55bec58ba63bd6dbe338944637dc8fc844..100d121d2c26d7c21669d90f416f40a3
          // Paper end - Fix kick event leave message not being sent
          org.purpurmc.purpur.task.BossBarTask.removeFromAll(player.getBukkitEntity()); // Purpur - Implement TPSBar
          ServerLevel serverLevel = player.level();
-@@ -1505,6 +1508,7 @@ public abstract class PlayerList {
+@@ -1496,6 +1499,7 @@ public abstract class PlayerList {
              serverPlayer.connection.send(clientboundUpdateRecipesPacket);
              serverPlayer.getRecipeBook().sendInitialRecipeBook(serverPlayer);
          }
diff --git a/leaf-server/minecraft-patches/features/0110-Leaves-Jade-Protocol.patch b/leaf-server/minecraft-patches/features/0109-Leaves-Jade-Protocol.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0110-Leaves-Jade-Protocol.patch
rename to leaf-server/minecraft-patches/features/0109-Leaves-Jade-Protocol.patch
diff --git a/leaf-server/minecraft-patches/features/0111-Leaves-Xaero-Map-Protocol.patch b/leaf-server/minecraft-patches/features/0110-Leaves-Xaero-Map-Protocol.patch
similarity index 89%
rename from leaf-server/minecraft-patches/features/0111-Leaves-Xaero-Map-Protocol.patch
rename to leaf-server/minecraft-patches/features/0110-Leaves-Xaero-Map-Protocol.patch
index da19761f..1017e662 100644
--- a/leaf-server/minecraft-patches/features/0111-Leaves-Xaero-Map-Protocol.patch
+++ b/leaf-server/minecraft-patches/features/0110-Leaves-Xaero-Map-Protocol.patch
@@ -9,10 +9,10 @@ Original project: https://github.com/LeavesMC/Leaves
 This patch is Powered by Xaero Map
 
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 100d121d2c26d7c21669d90f416f40a344c12bb9..137e9760fd02d479127fed9fa45e615d7c73864a 100644
+index 8724b03cbe22492c17d8d8c60fbd06d60a32925a..a2d5b58eef4b6def8032d2421f8f3d34e64cb70e 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -1215,6 +1215,7 @@ public abstract class PlayerList {
+@@ -1206,6 +1206,7 @@ public abstract class PlayerList {
          player.connection.send(new ClientboundInitializeBorderPacket(worldBorder));
          player.connection.send(new ClientboundSetTimePacket(level.getGameTime(), level.getDayTime(), level.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)));
          player.connection.send(new ClientboundSetDefaultSpawnPositionPacket(level.getSharedSpawnPos(), level.getSharedSpawnAngle()));
diff --git a/leaf-server/minecraft-patches/features/0112-Leaves-Syncmatica-Protocol.patch b/leaf-server/minecraft-patches/features/0111-Leaves-Syncmatica-Protocol.patch
similarity index 93%
rename from leaf-server/minecraft-patches/features/0112-Leaves-Syncmatica-Protocol.patch
rename to leaf-server/minecraft-patches/features/0111-Leaves-Syncmatica-Protocol.patch
index fb9b3485..d5c9106f 100644
--- a/leaf-server/minecraft-patches/features/0112-Leaves-Syncmatica-Protocol.patch
+++ b/leaf-server/minecraft-patches/features/0111-Leaves-Syncmatica-Protocol.patch
@@ -9,7 +9,7 @@ Original project: https://github.com/LeavesMC/Leaves
 This patch is Powered by Syncmatica (https://github.com/End-Tech/syncmatica)
 
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index aefe56847cab77cfc83ef24e965a1be9d9454107..c6b871037f9dea8c6cbe9d0a2acff2cb2a960c09 100644
+index f20cb459f83f870e1c04ed1d83eee885619dfe57..2e504082ba5d68874b2d56baa8676b840caf1abe 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -324,8 +324,11 @@ public class ServerGamePacketListenerImpl
diff --git a/leaf-server/minecraft-patches/features/0113-Leaves-Replay-Mod-API.patch b/leaf-server/minecraft-patches/features/0112-Leaves-Replay-Mod-API.patch
similarity index 99%
rename from leaf-server/minecraft-patches/features/0113-Leaves-Replay-Mod-API.patch
rename to leaf-server/minecraft-patches/features/0112-Leaves-Replay-Mod-API.patch
index 294db194..e7615fcb 100644
--- a/leaf-server/minecraft-patches/features/0113-Leaves-Replay-Mod-API.patch
+++ b/leaf-server/minecraft-patches/features/0112-Leaves-Replay-Mod-API.patch
@@ -191,7 +191,7 @@ index 880bf83929e636872eeb53c5c3ec9357972267db..47d9495ea2cf347f268bd84bf731c5b5
      private final PlayerAdvancements advancements;
      private final ServerStatsCounter stats;
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 137e9760fd02d479127fed9fa45e615d7c73864a..59cbbdc86b3e93479f57027963ee06e006e03110 100644
+index a2d5b58eef4b6def8032d2421f8f3d34e64cb70e..10502ed26662f13fafcafc644aecd98828ef4aec 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -131,6 +131,7 @@ public abstract class PlayerList {
@@ -375,7 +375,7 @@ index 137e9760fd02d479127fed9fa45e615d7c73864a..59cbbdc86b3e93479f57027963ee06e0
          this.playersByName.remove(player.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
          this.removeFromSendAllPlayerInfoBuckets(player); // Gale - Purpur - spread out sending all player info
          this.server.getCustomBossEvents().onPlayerDisconnect(player);
-@@ -1101,7 +1247,7 @@ public abstract class PlayerList {
+@@ -1092,7 +1238,7 @@ public abstract class PlayerList {
  
      // Paper start - whitelist verify event / login event
      public LoginResult canBypassFullServerLogin(final GameProfile profile, final LoginResult currentResult) {
diff --git a/leaf-server/minecraft-patches/features/0114-Petal-Async-Pathfinding.patch b/leaf-server/minecraft-patches/features/0113-Petal-Async-Pathfinding.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0114-Petal-Async-Pathfinding.patch
rename to leaf-server/minecraft-patches/features/0113-Petal-Async-Pathfinding.patch
diff --git a/leaf-server/minecraft-patches/features/0115-Petal-reduce-work-done-by-game-event-system.patch b/leaf-server/minecraft-patches/features/0114-Petal-reduce-work-done-by-game-event-system.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0115-Petal-reduce-work-done-by-game-event-system.patch
rename to leaf-server/minecraft-patches/features/0114-Petal-reduce-work-done-by-game-event-system.patch
diff --git a/leaf-server/minecraft-patches/features/0116-Reduce-canSee-work.patch b/leaf-server/minecraft-patches/features/0115-Reduce-canSee-work.patch
similarity index 95%
rename from leaf-server/minecraft-patches/features/0116-Reduce-canSee-work.patch
rename to leaf-server/minecraft-patches/features/0115-Reduce-canSee-work.patch
index d81408ef..1bb1d9e3 100644
--- a/leaf-server/minecraft-patches/features/0116-Reduce-canSee-work.patch
+++ b/leaf-server/minecraft-patches/features/0115-Reduce-canSee-work.patch
@@ -7,7 +7,7 @@ Co-authored by: Martijn Muijsers <martijnmuijsers@live.nl>
 Co-authored by: MachineBreaker <machinebreaker>
 
 diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
-index dd8c7afecd62edc2ab3933034bf469aea729be53..3bd42eb81eae3af9323021a5dc6edaa06dfcaead 100644
+index bee67a32c63df0901b9a9b6b3f6e7a35bb87025e..191214e2c3019e9e55cc1d9658c2446557f40173 100644
 --- a/net/minecraft/world/level/Level.java
 +++ b/net/minecraft/world/level/Level.java
 @@ -988,17 +988,19 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
diff --git a/leaf-server/minecraft-patches/features/0117-Fix-sprint-glitch.patch b/leaf-server/minecraft-patches/features/0116-Fix-sprint-glitch.patch
similarity index 90%
rename from leaf-server/minecraft-patches/features/0117-Fix-sprint-glitch.patch
rename to leaf-server/minecraft-patches/features/0116-Fix-sprint-glitch.patch
index 9fcadf5f..c647dd79 100644
--- a/leaf-server/minecraft-patches/features/0117-Fix-sprint-glitch.patch
+++ b/leaf-server/minecraft-patches/features/0116-Fix-sprint-glitch.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix sprint glitch
 
 
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index b536461c672c608aeeb690f41ea457fc57768e4f..34460363c4a5fbd274fee0f26d3731333c990072 100644
+index f712d4445d8ffdc8dbd5f51c2a8104b097df11d1..199d97ceb0cbb87a9ed88d2f34da144539d11d4c 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -1419,7 +1419,8 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
diff --git a/leaf-server/minecraft-patches/features/0118-Configurable-movement-speed-of-more-entities.patch b/leaf-server/minecraft-patches/features/0117-Configurable-movement-speed-of-more-entities.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0118-Configurable-movement-speed-of-more-entities.patch
rename to leaf-server/minecraft-patches/features/0117-Configurable-movement-speed-of-more-entities.patch
diff --git a/leaf-server/minecraft-patches/features/0119-Faster-sequencing-of-futures-for-chunk-structure-gen.patch b/leaf-server/minecraft-patches/features/0118-Faster-sequencing-of-futures-for-chunk-structure-gen.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0119-Faster-sequencing-of-futures-for-chunk-structure-gen.patch
rename to leaf-server/minecraft-patches/features/0118-Faster-sequencing-of-futures-for-chunk-structure-gen.patch
diff --git a/leaf-server/minecraft-patches/features/0120-Reduce-active-items-finding-hopper-nearby-check.patch b/leaf-server/minecraft-patches/features/0119-Reduce-active-items-finding-hopper-nearby-check.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0120-Reduce-active-items-finding-hopper-nearby-check.patch
rename to leaf-server/minecraft-patches/features/0119-Reduce-active-items-finding-hopper-nearby-check.patch
diff --git a/leaf-server/minecraft-patches/features/0121-Plazma-Add-some-missing-Pufferfish-configurations.patch b/leaf-server/minecraft-patches/features/0120-Plazma-Add-some-missing-Pufferfish-configurations.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0121-Plazma-Add-some-missing-Pufferfish-configurations.patch
rename to leaf-server/minecraft-patches/features/0120-Plazma-Add-some-missing-Pufferfish-configurations.patch
diff --git a/leaf-server/minecraft-patches/features/0122-Plazma-Add-missing-purpur-configuration-options.patch b/leaf-server/minecraft-patches/features/0121-Plazma-Add-missing-purpur-configuration-options.patch
similarity index 99%
rename from leaf-server/minecraft-patches/features/0122-Plazma-Add-missing-purpur-configuration-options.patch
rename to leaf-server/minecraft-patches/features/0121-Plazma-Add-missing-purpur-configuration-options.patch
index be049c54..7d820784 100644
--- a/leaf-server/minecraft-patches/features/0122-Plazma-Add-missing-purpur-configuration-options.patch
+++ b/leaf-server/minecraft-patches/features/0121-Plazma-Add-missing-purpur-configuration-options.patch
@@ -243,7 +243,7 @@ index 04b8d4be8d7b36585041b5ff69251d4150e54cae..c73840d0a08366b2d2ee3286589ab4e4
  
      @Override
 diff --git a/org/purpurmc/purpur/PurpurConfig.java b/org/purpurmc/purpur/PurpurConfig.java
-index ed777b003140486fd5d8d1db7af770301e30bec9..31450de492fbfdd83608ae668072bebd525db566 100644
+index 88f737304d4f4a774956a1cc39b5c01c37a3891d..21fa7e0e6838bf9a81ee6faf19c944e69b1fe740 100644
 --- a/org/purpurmc/purpur/PurpurConfig.java
 +++ b/org/purpurmc/purpur/PurpurConfig.java
 @@ -317,6 +317,7 @@ public class PurpurConfig {
diff --git a/leaf-server/minecraft-patches/features/0123-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/leaf-server/minecraft-patches/features/0122-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0123-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch
rename to leaf-server/minecraft-patches/features/0122-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch
diff --git a/leaf-server/minecraft-patches/features/0124-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch b/leaf-server/minecraft-patches/features/0123-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0124-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch
rename to leaf-server/minecraft-patches/features/0123-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch
diff --git a/leaf-server/minecraft-patches/features/0125-SparklyPaper-Optimize-canSee-checks.patch b/leaf-server/minecraft-patches/features/0124-SparklyPaper-Optimize-canSee-checks.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0125-SparklyPaper-Optimize-canSee-checks.patch
rename to leaf-server/minecraft-patches/features/0124-SparklyPaper-Optimize-canSee-checks.patch
diff --git a/leaf-server/minecraft-patches/features/0126-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch b/leaf-server/minecraft-patches/features/0125-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0126-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch
rename to leaf-server/minecraft-patches/features/0125-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch
diff --git a/leaf-server/minecraft-patches/features/0127-Polpot-Make-egg-and-snowball-can-knockback-player.patch b/leaf-server/minecraft-patches/features/0126-Polpot-Make-egg-and-snowball-can-knockback-player.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0127-Polpot-Make-egg-and-snowball-can-knockback-player.patch
rename to leaf-server/minecraft-patches/features/0126-Polpot-Make-egg-and-snowball-can-knockback-player.patch
diff --git a/leaf-server/minecraft-patches/features/0128-Redirect-vanilla-getProfiler-to-inactive-in-PathNavi.patch b/leaf-server/minecraft-patches/features/0127-Redirect-vanilla-getProfiler-to-inactive-in-PathNavi.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0128-Redirect-vanilla-getProfiler-to-inactive-in-PathNavi.patch
rename to leaf-server/minecraft-patches/features/0127-Redirect-vanilla-getProfiler-to-inactive-in-PathNavi.patch
diff --git a/leaf-server/minecraft-patches/features/0129-Remove-useless-creating-stats-json-bases-on-player-n.patch b/leaf-server/minecraft-patches/features/0128-Remove-useless-creating-stats-json-bases-on-player-n.patch
similarity index 85%
rename from leaf-server/minecraft-patches/features/0129-Remove-useless-creating-stats-json-bases-on-player-n.patch
rename to leaf-server/minecraft-patches/features/0128-Remove-useless-creating-stats-json-bases-on-player-n.patch
index e9c985a9..37fb3bd2 100644
--- a/leaf-server/minecraft-patches/features/0129-Remove-useless-creating-stats-json-bases-on-player-n.patch
+++ b/leaf-server/minecraft-patches/features/0128-Remove-useless-creating-stats-json-bases-on-player-n.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Remove useless creating stats json bases on player name logic
 
 
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 59cbbdc86b3e93479f57027963ee06e006e03110..b7690887a4902e83aebe928262664f57288f6183 100644
+index 10502ed26662f13fafcafc644aecd98828ef4aec..cedc4531e9a072e953943596311b9695b45cb548 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -1554,6 +1554,8 @@ public abstract class PlayerList {
+@@ -1545,6 +1545,8 @@ public abstract class PlayerList {
          if (serverStatsCounter == null) {
              File file = this.server.getWorldPath(LevelResource.PLAYER_STATS_DIR).toFile();
              File file1 = new File(file, uuid + ".json");
@@ -17,7 +17,7 @@ index 59cbbdc86b3e93479f57027963ee06e006e03110..b7690887a4902e83aebe928262664f57
              if (!file1.exists()) {
                  File file2 = new File(file, displayName + ".json"); // CraftBukkit
                  Path path = file2.toPath();
-@@ -1561,6 +1563,8 @@ public abstract class PlayerList {
+@@ -1552,6 +1554,8 @@ public abstract class PlayerList {
                      file2.renameTo(file1);
                  }
              }
diff --git a/leaf-server/minecraft-patches/features/0130-Improve-Purpur-AFK-system.patch b/leaf-server/minecraft-patches/features/0129-Improve-Purpur-AFK-system.patch
similarity index 99%
rename from leaf-server/minecraft-patches/features/0130-Improve-Purpur-AFK-system.patch
rename to leaf-server/minecraft-patches/features/0129-Improve-Purpur-AFK-system.patch
index de67a611..3bb7c425 100644
--- a/leaf-server/minecraft-patches/features/0130-Improve-Purpur-AFK-system.patch
+++ b/leaf-server/minecraft-patches/features/0129-Improve-Purpur-AFK-system.patch
@@ -152,7 +152,7 @@ index 2e504082ba5d68874b2d56baa8676b840caf1abe..e61ff0c5051a855e10310d4e6f76d79e
          synchronized (this.lastSeenMessages) {
              Optional var10000;
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index b7690887a4902e83aebe928262664f57288f6183..ae29ae36d5dc2ec19f1887e8d80532d4259b4622 100644
+index cedc4531e9a072e953943596311b9695b45cb548..a332253d11564818a24d78e4dff262e55d7cc450 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -675,6 +675,7 @@ public abstract class PlayerList {
diff --git a/leaf-server/minecraft-patches/features/0131-Virtual-thread-for-chat-executor.patch b/leaf-server/minecraft-patches/features/0130-Virtual-thread-for-chat-executor.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0131-Virtual-thread-for-chat-executor.patch
rename to leaf-server/minecraft-patches/features/0130-Virtual-thread-for-chat-executor.patch
diff --git a/leaf-server/minecraft-patches/features/0132-Virtual-thread-for-user-authenticator.patch b/leaf-server/minecraft-patches/features/0131-Virtual-thread-for-user-authenticator.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0132-Virtual-thread-for-user-authenticator.patch
rename to leaf-server/minecraft-patches/features/0131-Virtual-thread-for-user-authenticator.patch
diff --git a/leaf-server/minecraft-patches/features/0133-Mirai-Configurable-chat-message-signatures.patch b/leaf-server/minecraft-patches/features/0132-Mirai-Configurable-chat-message-signatures.patch
similarity index 98%
rename from leaf-server/minecraft-patches/features/0133-Mirai-Configurable-chat-message-signatures.patch
rename to leaf-server/minecraft-patches/features/0132-Mirai-Configurable-chat-message-signatures.patch
index 59293420..2d06365b 100644
--- a/leaf-server/minecraft-patches/features/0133-Mirai-Configurable-chat-message-signatures.patch
+++ b/leaf-server/minecraft-patches/features/0132-Mirai-Configurable-chat-message-signatures.patch
@@ -138,10 +138,10 @@ index fa6095200243fafa796e49df3930c6d7ab2dcd84..84030c40f2f91b433b3ccd21e0367d2f
          if (packet == null || this.processedDisconnect) { // Spigot
              return;
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index ae29ae36d5dc2ec19f1887e8d80532d4259b4622..83a23e4b9d2b9a8429e55e6798ce1787f8b58680 100644
+index a332253d11564818a24d78e4dff262e55d7cc450..47d0af92cb0d744f4188597ad3f4b096aca84a9e 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -1514,7 +1514,7 @@ public abstract class PlayerList {
+@@ -1505,7 +1505,7 @@ public abstract class PlayerList {
      public void broadcastChatMessage(PlayerChatMessage message, Predicate<ServerPlayer> shouldFilterMessageTo, @Nullable ServerPlayer sender, ChatType.Bound boundChatType, @Nullable Function<net.kyori.adventure.audience.Audience, Component> unsignedFunction) {
          // Paper end
          boolean flag = this.verifyChatTrusted(message);
@@ -150,7 +150,7 @@ index ae29ae36d5dc2ec19f1887e8d80532d4259b4622..83a23e4b9d2b9a8429e55e6798ce1787
          OutgoingChatMessage outgoingChatMessage = OutgoingChatMessage.create(message);
          boolean flag1 = false;
  
-@@ -1539,6 +1539,7 @@ public abstract class PlayerList {
+@@ -1530,6 +1530,7 @@ public abstract class PlayerList {
      }
  
      public boolean verifyChatTrusted(PlayerChatMessage message) {
diff --git a/leaf-server/minecraft-patches/features/0134-Matter-Secure-Seed.patch b/leaf-server/minecraft-patches/features/0133-Matter-Secure-Seed.patch
similarity index 99%
rename from leaf-server/minecraft-patches/features/0134-Matter-Secure-Seed.patch
rename to leaf-server/minecraft-patches/features/0133-Matter-Secure-Seed.patch
index 760f4b9a..d8f38a5d 100644
--- a/leaf-server/minecraft-patches/features/0134-Matter-Secure-Seed.patch
+++ b/leaf-server/minecraft-patches/features/0133-Matter-Secure-Seed.patch
@@ -110,7 +110,7 @@ index 182c14b660f8860bed627eed4e01fd4002153e9a..686c031ec73acc80683aaa39a78fe922
  
      @Nullable
 diff --git a/net/minecraft/world/level/chunk/ChunkGenerator.java b/net/minecraft/world/level/chunk/ChunkGenerator.java
-index 857aa6e29b57a0a8eea4d7c14971b9dde59bb0d0..23806f5f0c6c4ec9a86a6ea13b89b4f57372e6f1 100644
+index 854578c7880dc124980142941ee471072668c8e2..b21822f069e112cdf16fe995485e2a5b1d229a8c 100644
 --- a/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -342,7 +342,11 @@ public abstract class ChunkGenerator {
@@ -363,7 +363,7 @@ index ee0d9dddb36b6879fa113299e24f1aa3b2b151cc..6584c9320361dbbdea1899ab9e43b444
          int i3 = this.spreadType.evaluate(worldgenRandom, i2);
          int i4 = this.spreadType.evaluate(worldgenRandom, i2);
 diff --git a/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java b/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java
-index 1f939b325ec5291b3c4aabc4735c863f9436a6f8..ee60717e39928a9f89ad6c7a9b3b52ac156871e6 100644
+index f2eb0572b9d97d97bc847082461515a852310dfc..14e352aedeeb1cf088278d9551d0204b06593ceb 100644
 --- a/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java
 +++ b/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java
 @@ -119,8 +119,16 @@ public abstract class StructurePlacement {
diff --git a/leaf-server/minecraft-patches/features/0135-Matter-Secure-Seed-command.patch b/leaf-server/minecraft-patches/features/0134-Matter-Secure-Seed-command.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0135-Matter-Secure-Seed-command.patch
rename to leaf-server/minecraft-patches/features/0134-Matter-Secure-Seed-command.patch
diff --git a/leaf-server/minecraft-patches/features/0136-Faster-random-generator.patch b/leaf-server/minecraft-patches/features/0135-Faster-random-generator.patch
similarity index 98%
rename from leaf-server/minecraft-patches/features/0136-Faster-random-generator.patch
rename to leaf-server/minecraft-patches/features/0135-Faster-random-generator.patch
index 814f40a2..74bacc80 100644
--- a/leaf-server/minecraft-patches/features/0136-Faster-random-generator.patch
+++ b/leaf-server/minecraft-patches/features/0135-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 ce331618d70d3dcfa576994e3f67f8c81fd6e8cc..2bed05da7e5ba52e85d437460679a7b81293fe5b 100644
+index e0615ffe3e5cd317e5f05e167dbc857d5abaf50f..c44cc7107ff6cf1fd72e222773847deddf05e61c 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
@@ -110,7 +110,7 @@ index ce331618d70d3dcfa576994e3f67f8c81fd6e8cc..2bed05da7e5ba52e85d437460679a7b8
      private static final class RandomRandomSource extends ca.spottedleaf.moonrise.common.util.ThreadUnsafeRandom {
          public RandomRandomSource() {
 diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
-index 3bd42eb81eae3af9323021a5dc6edaa06dfcaead..8ebfb2f5cf439190ea9bd4ad81d737fbcd4514c2 100644
+index 191214e2c3019e9e55cc1d9658c2446557f40173..3f02f57eca3768d843e58dd2936f37c7f5743402 100644
 --- a/net/minecraft/world/level/Level.java
 +++ b/net/minecraft/world/level/Level.java
 @@ -117,7 +117,7 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
@@ -154,7 +154,7 @@ index bad1a03167f7586e5279592adcb43350c9b528cd..336d42d4e85716843633030ba1aa21b7
      public final Biome.ClimateSettings climateSettings;
      private final BiomeGenerationSettings generationSettings;
 diff --git a/net/minecraft/world/level/chunk/ChunkGenerator.java b/net/minecraft/world/level/chunk/ChunkGenerator.java
-index 23806f5f0c6c4ec9a86a6ea13b89b4f57372e6f1..e1ebbfab87aed9cc633f2fedb1e6edeca4ddc2ec 100644
+index b21822f069e112cdf16fe995485e2a5b1d229a8c..a95a4b39604e3200b69093165a2c48efa3f165ab 100644
 --- a/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -455,7 +455,7 @@ public abstract class ChunkGenerator {
@@ -302,7 +302,7 @@ index 6584c9320361dbbdea1899ab9e43b444de5006a6..06083cc7612ef28bcd9264bb21ab0bbb
          }
          // Leaf end - Matter - Secure Seed
 diff --git a/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java b/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java
-index ee60717e39928a9f89ad6c7a9b3b52ac156871e6..daed7cc619d5a0b7d7a75e013cb72ed88d57de6c 100644
+index 14e352aedeeb1cf088278d9551d0204b06593ceb..483f88767647358ec1297213953573fcb523b7a5 100644
 --- a/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java
 +++ b/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java
 @@ -124,7 +124,7 @@ public abstract class StructurePlacement {
diff --git a/leaf-server/minecraft-patches/features/0137-Don-t-save-primed-tnt-entity.patch b/leaf-server/minecraft-patches/features/0136-Don-t-save-primed-tnt-entity.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0137-Don-t-save-primed-tnt-entity.patch
rename to leaf-server/minecraft-patches/features/0136-Don-t-save-primed-tnt-entity.patch
diff --git a/leaf-server/minecraft-patches/features/0138-Don-t-save-falling-block-entity.patch b/leaf-server/minecraft-patches/features/0137-Don-t-save-falling-block-entity.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0138-Don-t-save-falling-block-entity.patch
rename to leaf-server/minecraft-patches/features/0137-Don-t-save-falling-block-entity.patch
diff --git a/leaf-server/minecraft-patches/features/0139-Configurable-connection-message.patch b/leaf-server/minecraft-patches/features/0138-Configurable-connection-message.patch
similarity index 97%
rename from leaf-server/minecraft-patches/features/0139-Configurable-connection-message.patch
rename to leaf-server/minecraft-patches/features/0138-Configurable-connection-message.patch
index 64fa3a60..ec395da4 100644
--- a/leaf-server/minecraft-patches/features/0139-Configurable-connection-message.patch
+++ b/leaf-server/minecraft-patches/features/0138-Configurable-connection-message.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable connection message
 
 
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 83a23e4b9d2b9a8429e55e6798ce1787f8b58680..5dadcca0e3f9923ff192ed742231c9b8ca5f015b 100644
+index 47d0af92cb0d744f4188597ad3f4b096aca84a9e..ab79b6c3978e7a1b3935e18353841dfa44c9af29 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -445,7 +445,7 @@ public abstract class PlayerList {
@@ -35,7 +35,7 @@ index 83a23e4b9d2b9a8429e55e6798ce1787f8b58680..5dadcca0e3f9923ff192ed742231c9b8
          this.cserver.getPluginManager().callEvent(playerQuitEvent);
          player.getBukkitEntity().disconnect(playerQuitEvent.getQuitMessage());
  
-@@ -1667,4 +1667,40 @@ public abstract class PlayerList {
+@@ -1658,4 +1658,40 @@ public abstract class PlayerList {
      public boolean isAllowCommandsForAllPlayers() {
          return this.allowCommandsForAllPlayers;
      }
diff --git a/leaf-server/minecraft-patches/features/0140-Configurable-unknown-command-message.patch b/leaf-server/minecraft-patches/features/0139-Configurable-unknown-command-message.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0140-Configurable-unknown-command-message.patch
rename to leaf-server/minecraft-patches/features/0139-Configurable-unknown-command-message.patch
diff --git a/leaf-server/minecraft-patches/features/0141-Remove-stream-in-BlockBehaviour-cache-blockstate.patch b/leaf-server/minecraft-patches/features/0140-Remove-stream-in-BlockBehaviour-cache-blockstate.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0141-Remove-stream-in-BlockBehaviour-cache-blockstate.patch
rename to leaf-server/minecraft-patches/features/0140-Remove-stream-in-BlockBehaviour-cache-blockstate.patch
diff --git a/leaf-server/minecraft-patches/features/0142-Remove-stream-in-entity-visible-effects-filter.patch b/leaf-server/minecraft-patches/features/0141-Remove-stream-in-entity-visible-effects-filter.patch
similarity index 93%
rename from leaf-server/minecraft-patches/features/0142-Remove-stream-in-entity-visible-effects-filter.patch
rename to leaf-server/minecraft-patches/features/0141-Remove-stream-in-entity-visible-effects-filter.patch
index 9e499c74..2718f648 100644
--- a/leaf-server/minecraft-patches/features/0142-Remove-stream-in-entity-visible-effects-filter.patch
+++ b/leaf-server/minecraft-patches/features/0141-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 d8c3f05d36916e122bfd47d761b4d91ab54fd8f5..a75f8f86ebd3bb73b5fbeb389137344256e1175f 100644
+index 199d97ceb0cbb87a9ed88d2f34da144539d11d4c..8bac55cda0114f1ae27a9a03860a7b3fb6002e4a 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/0143-Remove-stream-and-double-iteration-in-enough-deep-sl.patch b/leaf-server/minecraft-patches/features/0142-Remove-stream-and-double-iteration-in-enough-deep-sl.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0143-Remove-stream-and-double-iteration-in-enough-deep-sl.patch
rename to leaf-server/minecraft-patches/features/0142-Remove-stream-and-double-iteration-in-enough-deep-sl.patch
diff --git a/leaf-server/minecraft-patches/features/0144-Remove-stream-in-trial-spawner-ticking.patch b/leaf-server/minecraft-patches/features/0143-Remove-stream-in-trial-spawner-ticking.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0144-Remove-stream-in-trial-spawner-ticking.patch
rename to leaf-server/minecraft-patches/features/0143-Remove-stream-in-trial-spawner-ticking.patch
diff --git a/leaf-server/minecraft-patches/features/0145-Remove-stream-in-Brain.patch b/leaf-server/minecraft-patches/features/0144-Remove-stream-in-Brain.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0145-Remove-stream-in-Brain.patch
rename to leaf-server/minecraft-patches/features/0144-Remove-stream-in-Brain.patch
diff --git a/leaf-server/minecraft-patches/features/0146-Remove-stream-in-BehaviorUtils.patch b/leaf-server/minecraft-patches/features/0145-Remove-stream-in-BehaviorUtils.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0146-Remove-stream-in-BehaviorUtils.patch
rename to leaf-server/minecraft-patches/features/0145-Remove-stream-in-BehaviorUtils.patch
diff --git a/leaf-server/minecraft-patches/features/0147-Remove-stream-in-YieldJobSite.patch b/leaf-server/minecraft-patches/features/0146-Remove-stream-in-YieldJobSite.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0147-Remove-stream-in-YieldJobSite.patch
rename to leaf-server/minecraft-patches/features/0146-Remove-stream-in-YieldJobSite.patch
diff --git a/leaf-server/minecraft-patches/features/0148-Remove-stream-in-PlayerSensor.patch b/leaf-server/minecraft-patches/features/0147-Remove-stream-in-PlayerSensor.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0148-Remove-stream-in-PlayerSensor.patch
rename to leaf-server/minecraft-patches/features/0147-Remove-stream-in-PlayerSensor.patch
diff --git a/leaf-server/minecraft-patches/features/0149-Remove-stream-in-GolemSensor.patch b/leaf-server/minecraft-patches/features/0148-Remove-stream-in-GolemSensor.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0149-Remove-stream-in-GolemSensor.patch
rename to leaf-server/minecraft-patches/features/0148-Remove-stream-in-GolemSensor.patch
diff --git a/leaf-server/minecraft-patches/features/0150-Remove-stream-in-GateBehavior.patch b/leaf-server/minecraft-patches/features/0149-Remove-stream-in-GateBehavior.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0150-Remove-stream-in-GateBehavior.patch
rename to leaf-server/minecraft-patches/features/0149-Remove-stream-in-GateBehavior.patch
diff --git a/leaf-server/minecraft-patches/features/0151-Remove-stream-in-matchingSlot.patch b/leaf-server/minecraft-patches/features/0150-Remove-stream-in-matchingSlot.patch
similarity index 91%
rename from leaf-server/minecraft-patches/features/0151-Remove-stream-in-matchingSlot.patch
rename to leaf-server/minecraft-patches/features/0150-Remove-stream-in-matchingSlot.patch
index b63b7c81..6bc8b2d3 100644
--- a/leaf-server/minecraft-patches/features/0151-Remove-stream-in-matchingSlot.patch
+++ b/leaf-server/minecraft-patches/features/0150-Remove-stream-in-matchingSlot.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove stream in matchingSlot
 
 
 diff --git a/net/minecraft/world/item/enchantment/Enchantment.java b/net/minecraft/world/item/enchantment/Enchantment.java
-index 7a620eb92b1e672cedd72ec4d986c01eba337686..183874d90d576d740c5d924accc5c0d7fdb8450c 100644
+index 0460da0124d2c48b7fed45fa182537fd8059135d..08c49c078d03ff142cc74b7ee7103bf3ccf41dc4 100644
 --- a/net/minecraft/world/item/enchantment/Enchantment.java
 +++ b/net/minecraft/world/item/enchantment/Enchantment.java
 @@ -126,7 +126,15 @@ public record Enchantment(Component description, Enchantment.EnchantmentDefiniti
diff --git a/leaf-server/minecraft-patches/features/0152-Remove-stream-in-entity-mountedOrDismounted-changes-.patch b/leaf-server/minecraft-patches/features/0151-Remove-stream-in-entity-mountedOrDismounted-changes-.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0152-Remove-stream-in-entity-mountedOrDismounted-changes-.patch
rename to leaf-server/minecraft-patches/features/0151-Remove-stream-in-entity-mountedOrDismounted-changes-.patch
diff --git a/leaf-server/minecraft-patches/features/0153-Replace-Entity-active-effects-map-with-optimized-col.patch b/leaf-server/minecraft-patches/features/0152-Replace-Entity-active-effects-map-with-optimized-col.patch
similarity index 96%
rename from leaf-server/minecraft-patches/features/0153-Replace-Entity-active-effects-map-with-optimized-col.patch
rename to leaf-server/minecraft-patches/features/0152-Replace-Entity-active-effects-map-with-optimized-col.patch
index d9affe7b..b9a2052c 100644
--- a/leaf-server/minecraft-patches/features/0153-Replace-Entity-active-effects-map-with-optimized-col.patch
+++ b/leaf-server/minecraft-patches/features/0152-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 a75f8f86ebd3bb73b5fbeb389137344256e1175f..1df69848c60a724b14bb6230a67ecd7cac1a0e03 100644
+index 8bac55cda0114f1ae27a9a03860a7b3fb6002e4a..f30d24136e5f47c9be79e2c0b4b98d0e796d868b 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/0154-Replace-criterion-map-with-optimized-collection.patch b/leaf-server/minecraft-patches/features/0153-Replace-criterion-map-with-optimized-collection.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0154-Replace-criterion-map-with-optimized-collection.patch
rename to leaf-server/minecraft-patches/features/0153-Replace-criterion-map-with-optimized-collection.patch
diff --git a/leaf-server/minecraft-patches/features/0155-Replace-brain-with-optimized-collection.patch b/leaf-server/minecraft-patches/features/0154-Replace-brain-with-optimized-collection.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0155-Replace-brain-with-optimized-collection.patch
rename to leaf-server/minecraft-patches/features/0154-Replace-brain-with-optimized-collection.patch
diff --git a/leaf-server/minecraft-patches/features/0156-Reduce-worldgen-allocations.patch b/leaf-server/minecraft-patches/features/0155-Reduce-worldgen-allocations.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0156-Reduce-worldgen-allocations.patch
rename to leaf-server/minecraft-patches/features/0155-Reduce-worldgen-allocations.patch
diff --git a/leaf-server/minecraft-patches/features/0157-Use-caffeine-cache-for-kickPermission-instead-of-usi.patch b/leaf-server/minecraft-patches/features/0156-Use-caffeine-cache-for-kickPermission-instead-of-usi.patch
similarity index 97%
rename from leaf-server/minecraft-patches/features/0157-Use-caffeine-cache-for-kickPermission-instead-of-usi.patch
rename to leaf-server/minecraft-patches/features/0156-Use-caffeine-cache-for-kickPermission-instead-of-usi.patch
index a75566aa..976d69be 100644
--- a/leaf-server/minecraft-patches/features/0157-Use-caffeine-cache-for-kickPermission-instead-of-usi.patch
+++ b/leaf-server/minecraft-patches/features/0156-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 0c73d4919e58b9282a8a6fc24fc7ab8e87b97b74..070fc3b4ec0558c597eb411db5b22edc447fe976 100644
+index e61ff0c5051a855e10310d4e6f76d79e9ab86716..1556b2d4a758e3a15b6c4468bf994ea3781a4958 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/0158-Do-not-place-player-if-the-server-is-full.patch b/leaf-server/minecraft-patches/features/0157-Do-not-place-player-if-the-server-is-full.patch
similarity index 95%
rename from leaf-server/minecraft-patches/features/0158-Do-not-place-player-if-the-server-is-full.patch
rename to leaf-server/minecraft-patches/features/0157-Do-not-place-player-if-the-server-is-full.patch
index 52f2ab64..3226e6f0 100644
--- a/leaf-server/minecraft-patches/features/0158-Do-not-place-player-if-the-server-is-full.patch
+++ b/leaf-server/minecraft-patches/features/0157-Do-not-place-player-if-the-server-is-full.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Do not place player if the server is full
 Fix https://github.com/PaperMC/Paper/issues/10668
 
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 5dadcca0e3f9923ff192ed742231c9b8ca5f015b..b5ecb22c95eca2ac3dc8d201e6964f2c34130ae9 100644
+index ab79b6c3978e7a1b3935e18353841dfa44c9af29..92b37775282ca1f35edfc51305b98af5a9adc5cb 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -349,6 +349,13 @@ public abstract class PlayerList {
@@ -23,7 +23,7 @@ index 5dadcca0e3f9923ff192ed742231c9b8ca5f015b..b5ecb22c95eca2ac3dc8d201e6964f2c
  
              org.bukkit.Location loc = ev.getSpawnLocation();
              serverLevel = ((org.bukkit.craftbukkit.CraftWorld) loc.getWorld()).getHandle();
-@@ -1248,7 +1255,7 @@ public abstract class PlayerList {
+@@ -1239,7 +1246,7 @@ public abstract class PlayerList {
  
      // Paper start - whitelist verify event / login event
      public LoginResult canBypassFullServerLogin(final GameProfile profile, final LoginResult currentResult) {
diff --git a/leaf-server/minecraft-patches/features/0159-Fix-MC-65198.patch b/leaf-server/minecraft-patches/features/0158-Fix-MC-65198.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0159-Fix-MC-65198.patch
rename to leaf-server/minecraft-patches/features/0158-Fix-MC-65198.patch
diff --git a/leaf-server/minecraft-patches/features/0160-Fix-MC-200418.patch b/leaf-server/minecraft-patches/features/0159-Fix-MC-200418.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0160-Fix-MC-200418.patch
rename to leaf-server/minecraft-patches/features/0159-Fix-MC-200418.patch
diff --git a/leaf-server/minecraft-patches/features/0161-Fix-MC-119417.patch b/leaf-server/minecraft-patches/features/0160-Fix-MC-119417.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0161-Fix-MC-119417.patch
rename to leaf-server/minecraft-patches/features/0160-Fix-MC-119417.patch
diff --git a/leaf-server/minecraft-patches/features/0162-Fix-MC-223153.patch b/leaf-server/minecraft-patches/features/0161-Fix-MC-223153.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0162-Fix-MC-223153.patch
rename to leaf-server/minecraft-patches/features/0161-Fix-MC-223153.patch
diff --git a/leaf-server/minecraft-patches/features/0163-Configurable-player-knockback-zombie.patch b/leaf-server/minecraft-patches/features/0162-Configurable-player-knockback-zombie.patch
similarity index 95%
rename from leaf-server/minecraft-patches/features/0163-Configurable-player-knockback-zombie.patch
rename to leaf-server/minecraft-patches/features/0162-Configurable-player-knockback-zombie.patch
index e7c18f07..2767119e 100644
--- a/leaf-server/minecraft-patches/features/0163-Configurable-player-knockback-zombie.patch
+++ b/leaf-server/minecraft-patches/features/0162-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 1df69848c60a724b14bb6230a67ecd7cac1a0e03..f63d0af0f6dc8a634f56f329d256affeaeac17da 100644
+index f30d24136e5f47c9be79e2c0b4b98d0e796d868b..4d4efd979c4478c1571e7044f639afe08a7118d6 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/0164-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch b/leaf-server/minecraft-patches/features/0163-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0164-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch
rename to leaf-server/minecraft-patches/features/0163-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch
diff --git a/leaf-server/minecraft-patches/features/0165-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch b/leaf-server/minecraft-patches/features/0164-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0165-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch
rename to leaf-server/minecraft-patches/features/0164-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch
diff --git a/leaf-server/minecraft-patches/features/0166-Paper-PR-Fix-some-beacon-event-issues.patch b/leaf-server/minecraft-patches/features/0165-Paper-PR-Fix-some-beacon-event-issues.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0166-Paper-PR-Fix-some-beacon-event-issues.patch
rename to leaf-server/minecraft-patches/features/0165-Paper-PR-Fix-some-beacon-event-issues.patch
diff --git a/leaf-server/minecraft-patches/features/0167-Dont-send-useless-entity-packets.patch b/leaf-server/minecraft-patches/features/0166-Dont-send-useless-entity-packets.patch
similarity index 96%
rename from leaf-server/minecraft-patches/features/0167-Dont-send-useless-entity-packets.patch
rename to leaf-server/minecraft-patches/features/0166-Dont-send-useless-entity-packets.patch
index ef377cdb..b3e403c7 100644
--- a/leaf-server/minecraft-patches/features/0167-Dont-send-useless-entity-packets.patch
+++ b/leaf-server/minecraft-patches/features/0166-Dont-send-useless-entity-packets.patch
@@ -9,7 +9,7 @@ Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
 diff --git a/net/minecraft/server/level/ServerEntity.java b/net/minecraft/server/level/ServerEntity.java
-index d605c4da4475fdc47a6d0c90fbca2713fc9d8fef..add696ec1835eb161d6fc94509a2a77febd23d69 100644
+index d605c4da4475fdc47a6d0c90fbca2713fc9d8fef..0dee18df07c979da6125a4e7a955343e44d67ac2 100644
 --- a/net/minecraft/server/level/ServerEntity.java
 +++ b/net/minecraft/server/level/ServerEntity.java
 @@ -225,6 +225,8 @@ public class ServerEntity {
diff --git a/leaf-server/minecraft-patches/features/0168-Multithreaded-Tracker.patch b/leaf-server/minecraft-patches/features/0167-Multithreaded-Tracker.patch
similarity index 99%
rename from leaf-server/minecraft-patches/features/0168-Multithreaded-Tracker.patch
rename to leaf-server/minecraft-patches/features/0167-Multithreaded-Tracker.patch
index 8ea339e1..04fb9ba2 100644
--- a/leaf-server/minecraft-patches/features/0168-Multithreaded-Tracker.patch
+++ b/leaf-server/minecraft-patches/features/0167-Multithreaded-Tracker.patch
@@ -138,7 +138,7 @@ index 9c0c99b936b4a82ebfe924866e53ec71f7bbe9ad..2ccff968cb2065d34fad4d27573f9e30
                  .add(
                      new ClientboundUpdateAttributesPacket.AttributeSnapshot(
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 07943aa3be4222ab7a63b09a6625f7a003da8725..6c1a8925b1e13a0ebddc1b45a980fe8bdd8676cf 100644
+index efb281f71ef5404fa40b7d04104b1c15d14e2c05..90409e9ef5cac2abe6748b723207c33224821194 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -1732,6 +1732,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1218,7 +1218,7 @@ index 08d12a1acc3a672a77daa15f82392cd603c30283..b0ac6de9e0f15d234781fc43dd6fd1d5
                          }
                      }
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f70ad292afd21c534369f34d465c00591c71fc7a..0f95b746f5d728f923b1b558b584e2e1becf16eb 100644
+index 1556b2d4a758e3a15b6c4468bf994ea3781a4958..581791bf2892715543f003c36e301e690cc393f1 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1928,7 +1928,7 @@ public class ServerGamePacketListenerImpl
diff --git a/leaf-server/minecraft-patches/features/0169-Nitori-Async-playerdata-saving.patch b/leaf-server/minecraft-patches/features/0168-Nitori-Async-playerdata-saving.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0169-Nitori-Async-playerdata-saving.patch
rename to leaf-server/minecraft-patches/features/0168-Nitori-Async-playerdata-saving.patch
diff --git a/leaf-server/minecraft-patches/features/0170-Optimize-nearby-alive-players-for-spawning.patch b/leaf-server/minecraft-patches/features/0169-Optimize-nearby-alive-players-for-spawning.patch
similarity index 98%
rename from leaf-server/minecraft-patches/features/0170-Optimize-nearby-alive-players-for-spawning.patch
rename to leaf-server/minecraft-patches/features/0169-Optimize-nearby-alive-players-for-spawning.patch
index 1a656f78..ca22034d 100644
--- a/leaf-server/minecraft-patches/features/0170-Optimize-nearby-alive-players-for-spawning.patch
+++ b/leaf-server/minecraft-patches/features/0169-Optimize-nearby-alive-players-for-spawning.patch
@@ -20,7 +20,7 @@ index 1842cbe25cc0f9be937caf0a78e915bd3d6ea1e5..a6a216c598978f719851856e4ea61e75
      // Paper end - Affects Spawning API
  
 diff --git a/net/minecraft/world/entity/monster/Zombie.java b/net/minecraft/world/entity/monster/Zombie.java
-index 3c1bc0259634be5d988eae93d781c351ec6f3251..5563720a6d92cad974632bdc97bb35c15310483c 100644
+index 8907a5cc50df34cd77f0844e6a503f87e5a2d051..202dca0a106a1610d8e58b7e9ba0c612998dd868 100644
 --- a/net/minecraft/world/entity/monster/Zombie.java
 +++ b/net/minecraft/world/entity/monster/Zombie.java
 @@ -410,7 +410,7 @@ public class Zombie extends Monster {
diff --git a/leaf-server/minecraft-patches/features/0171-Cache-blockstate-cache-array.patch b/leaf-server/minecraft-patches/features/0170-Cache-blockstate-cache-array.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0171-Cache-blockstate-cache-array.patch
rename to leaf-server/minecraft-patches/features/0170-Cache-blockstate-cache-array.patch
diff --git a/leaf-server/minecraft-patches/features/0172-Asynchronous-locator.patch b/leaf-server/minecraft-patches/features/0171-Asynchronous-locator.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0172-Asynchronous-locator.patch
rename to leaf-server/minecraft-patches/features/0171-Asynchronous-locator.patch
diff --git a/leaf-server/minecraft-patches/features/0173-Smart-sort-entities-in-NearestLivingEntitySensor.patch b/leaf-server/minecraft-patches/features/0172-Smart-sort-entities-in-NearestLivingEntitySensor.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0173-Smart-sort-entities-in-NearestLivingEntitySensor.patch
rename to leaf-server/minecraft-patches/features/0172-Smart-sort-entities-in-NearestLivingEntitySensor.patch
diff --git a/leaf-server/minecraft-patches/features/0174-Further-reduce-memory-footprint-of-CompoundTag.patch b/leaf-server/minecraft-patches/features/0173-Further-reduce-memory-footprint-of-CompoundTag.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0174-Further-reduce-memory-footprint-of-CompoundTag.patch
rename to leaf-server/minecraft-patches/features/0173-Further-reduce-memory-footprint-of-CompoundTag.patch
diff --git a/leaf-server/minecraft-patches/features/0175-Optimize-Entity-distanceToSqr.patch b/leaf-server/minecraft-patches/features/0174-Optimize-Entity-distanceToSqr.patch
similarity index 97%
rename from leaf-server/minecraft-patches/features/0175-Optimize-Entity-distanceToSqr.patch
rename to leaf-server/minecraft-patches/features/0174-Optimize-Entity-distanceToSqr.patch
index ea11681c..edef344e 100644
--- a/leaf-server/minecraft-patches/features/0175-Optimize-Entity-distanceToSqr.patch
+++ b/leaf-server/minecraft-patches/features/0174-Optimize-Entity-distanceToSqr.patch
@@ -8,7 +8,7 @@ avoids multiple casting in Entity#distanceTo, using Math#sqrt directly instead o
 these methods more able to be inlined by the JIT compiler.
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 2bed05da7e5ba52e85d437460679a7b81293fe5b..fde4109b27fbafd9db1eaeedf7a6cd754a84024d 100644
+index c44cc7107ff6cf1fd72e222773847deddf05e61c..4e914104b02355fb854b0f4946671429264e1e1d 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -2260,31 +2260,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/leaf-server/minecraft-patches/features/0176-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch b/leaf-server/minecraft-patches/features/0175-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0176-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch
rename to leaf-server/minecraft-patches/features/0175-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch
diff --git a/leaf-server/minecraft-patches/features/0177-Cache-tile-entity-position.patch b/leaf-server/minecraft-patches/features/0176-Cache-tile-entity-position.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0177-Cache-tile-entity-position.patch
rename to leaf-server/minecraft-patches/features/0176-Cache-tile-entity-position.patch
diff --git a/leaf-server/minecraft-patches/features/0178-TT20-Lag-compensation.patch b/leaf-server/minecraft-patches/features/0177-TT20-Lag-compensation.patch
similarity index 97%
rename from leaf-server/minecraft-patches/features/0178-TT20-Lag-compensation.patch
rename to leaf-server/minecraft-patches/features/0177-TT20-Lag-compensation.patch
index d825871e..8a460765 100644
--- a/leaf-server/minecraft-patches/features/0178-TT20-Lag-compensation.patch
+++ b/leaf-server/minecraft-patches/features/0177-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 6c1a8925b1e13a0ebddc1b45a980fe8bdd8676cf..169d4c5e317af201a2d5ad0d82d39805376c2e9e 100644
+index 90409e9ef5cac2abe6748b723207c33224821194..a780cba7e2e95412226d9e80b892ab0126f50666 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/0179-C2ME-Reduce-Allocations.patch b/leaf-server/minecraft-patches/features/0178-C2ME-Reduce-Allocations.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0179-C2ME-Reduce-Allocations.patch
rename to leaf-server/minecraft-patches/features/0178-C2ME-Reduce-Allocations.patch
diff --git a/leaf-server/minecraft-patches/features/0180-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch b/leaf-server/minecraft-patches/features/0179-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch
similarity index 94%
rename from leaf-server/minecraft-patches/features/0180-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch
rename to leaf-server/minecraft-patches/features/0179-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch
index 49ef5847..cfee8e7a 100644
--- a/leaf-server/minecraft-patches/features/0180-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch
+++ b/leaf-server/minecraft-patches/features/0179-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch
@@ -12,7 +12,7 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium)
 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 80d80bc0c6c22ceda190fd238ca63875d47fc599..a1efe500e3751e1345d0c5b7671b378a97541f88 100644
+index de4d13e7c6f57d6cc3a78b1b9ca914157820186c..32f754a4c1d7a91bbbbf4995559ac2858ef10e1c 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/0181-Lithium-fast-util.patch b/leaf-server/minecraft-patches/features/0180-Lithium-fast-util.patch
similarity index 97%
rename from leaf-server/minecraft-patches/features/0181-Lithium-fast-util.patch
rename to leaf-server/minecraft-patches/features/0180-Lithium-fast-util.patch
index c1d03054..affc7842 100644
--- a/leaf-server/minecraft-patches/features/0181-Lithium-fast-util.patch
+++ b/leaf-server/minecraft-patches/features/0180-Lithium-fast-util.patch
@@ -11,7 +11,7 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium)
 Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
 
 diff --git a/net/minecraft/core/Direction.java b/net/minecraft/core/Direction.java
-index 56a5903f5a919dd2fc8da9a1693bcee42eb29973..2cea11ad32d78dd1d0650912bfa35d7ae02a4fc5 100644
+index 55d56d61036dae4613d24309a57c072592e984a8..8447557b808f420f22c54882bf51a308965063fe 100644
 --- a/net/minecraft/core/Direction.java
 +++ b/net/minecraft/core/Direction.java
 @@ -222,7 +222,7 @@ public enum Direction implements StringRepresentable, ca.spottedleaf.moonrise.pa
diff --git a/leaf-server/minecraft-patches/features/0182-Lithium-cached-iterate-outwards.patch b/leaf-server/minecraft-patches/features/0181-Lithium-cached-iterate-outwards.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0182-Lithium-cached-iterate-outwards.patch
rename to leaf-server/minecraft-patches/features/0181-Lithium-cached-iterate-outwards.patch
diff --git a/leaf-server/minecraft-patches/features/0183-Use-faster-and-thread-safe-ban-list-date-format-pars.patch b/leaf-server/minecraft-patches/features/0182-Use-faster-and-thread-safe-ban-list-date-format-pars.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0183-Use-faster-and-thread-safe-ban-list-date-format-pars.patch
rename to leaf-server/minecraft-patches/features/0182-Use-faster-and-thread-safe-ban-list-date-format-pars.patch
diff --git a/leaf-server/minecraft-patches/features/0184-C2ME-Optimize-world-gen-math.patch b/leaf-server/minecraft-patches/features/0183-C2ME-Optimize-world-gen-math.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0184-C2ME-Optimize-world-gen-math.patch
rename to leaf-server/minecraft-patches/features/0183-C2ME-Optimize-world-gen-math.patch
diff --git a/leaf-server/minecraft-patches/features/0185-Cache-chunk-key.patch b/leaf-server/minecraft-patches/features/0184-Cache-chunk-key.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0185-Cache-chunk-key.patch
rename to leaf-server/minecraft-patches/features/0184-Cache-chunk-key.patch
diff --git a/leaf-server/minecraft-patches/features/0186-Cache-random-tick-block-status.patch b/leaf-server/minecraft-patches/features/0185-Cache-random-tick-block-status.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0186-Cache-random-tick-block-status.patch
rename to leaf-server/minecraft-patches/features/0185-Cache-random-tick-block-status.patch
diff --git a/leaf-server/minecraft-patches/features/0187-Cache-part-of-canHoldFluid-result.patch b/leaf-server/minecraft-patches/features/0186-Cache-part-of-canHoldFluid-result.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0187-Cache-part-of-canHoldFluid-result.patch
rename to leaf-server/minecraft-patches/features/0186-Cache-part-of-canHoldFluid-result.patch
diff --git a/leaf-server/minecraft-patches/features/0188-Configurable-tripwire-dupe.patch b/leaf-server/minecraft-patches/features/0187-Configurable-tripwire-dupe.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0188-Configurable-tripwire-dupe.patch
rename to leaf-server/minecraft-patches/features/0187-Configurable-tripwire-dupe.patch
diff --git a/leaf-server/minecraft-patches/features/0189-Paper-PR-Fix-MC-117075-Block-Entities-Unload-Lag-Spi.patch b/leaf-server/minecraft-patches/features/0188-Paper-PR-Fix-MC-117075-Block-Entities-Unload-Lag-Spi.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0189-Paper-PR-Fix-MC-117075-Block-Entities-Unload-Lag-Spi.patch
rename to leaf-server/minecraft-patches/features/0188-Paper-PR-Fix-MC-117075-Block-Entities-Unload-Lag-Spi.patch
diff --git a/leaf-server/minecraft-patches/features/0190-Sepals-Rearrange-the-attackable-conditions.patch b/leaf-server/minecraft-patches/features/0189-Sepals-Rearrange-the-attackable-conditions.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0190-Sepals-Rearrange-the-attackable-conditions.patch
rename to leaf-server/minecraft-patches/features/0189-Sepals-Rearrange-the-attackable-conditions.patch
diff --git a/leaf-server/minecraft-patches/features/0191-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch b/leaf-server/minecraft-patches/features/0190-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0191-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch
rename to leaf-server/minecraft-patches/features/0190-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch
diff --git a/leaf-server/minecraft-patches/features/0192-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch b/leaf-server/minecraft-patches/features/0191-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0192-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch
rename to leaf-server/minecraft-patches/features/0191-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch
diff --git a/leaf-server/minecraft-patches/features/0193-Optimize-checking-nearby-players-for-spawning.patch b/leaf-server/minecraft-patches/features/0192-Optimize-checking-nearby-players-for-spawning.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0193-Optimize-checking-nearby-players-for-spawning.patch
rename to leaf-server/minecraft-patches/features/0192-Optimize-checking-nearby-players-for-spawning.patch
diff --git a/leaf-server/minecraft-patches/features/0194-Cache-supporting-block-check.patch b/leaf-server/minecraft-patches/features/0193-Cache-supporting-block-check.patch
similarity index 96%
rename from leaf-server/minecraft-patches/features/0194-Cache-supporting-block-check.patch
rename to leaf-server/minecraft-patches/features/0193-Cache-supporting-block-check.patch
index c36e02de..c4412626 100644
--- a/leaf-server/minecraft-patches/features/0194-Cache-supporting-block-check.patch
+++ b/leaf-server/minecraft-patches/features/0193-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 fde4109b27fbafd9db1eaeedf7a6cd754a84024d..129248da7e1bfa5edc1c1a43c98a400f697e735f 100644
+index 4e914104b02355fb854b0f4946671429264e1e1d..1d75ea57923f891a07b0c29e065ad46cdfac9b91 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/0195-Avoid-useless-deque-clear-on-LevelTicks-cleanupAfter.patch b/leaf-server/minecraft-patches/features/0194-Avoid-useless-deque-clear-on-LevelTicks-cleanupAfter.patch
similarity index 90%
rename from leaf-server/minecraft-patches/features/0195-Avoid-useless-deque-clear-on-LevelTicks-cleanupAfter.patch
rename to leaf-server/minecraft-patches/features/0194-Avoid-useless-deque-clear-on-LevelTicks-cleanupAfter.patch
index f9feba13..dd77f49b 100644
--- a/leaf-server/minecraft-patches/features/0195-Avoid-useless-deque-clear-on-LevelTicks-cleanupAfter.patch
+++ b/leaf-server/minecraft-patches/features/0194-Avoid-useless-deque-clear-on-LevelTicks-cleanupAfter.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Avoid useless deque clear on LevelTicks#cleanupAfterTick
 
 
 diff --git a/net/minecraft/world/ticks/LevelTicks.java b/net/minecraft/world/ticks/LevelTicks.java
-index fbf0d3b808c66e8971c747619f6acf7417af5ef7..d4542a86a2a9bfcfa7b6b7a213f233542ffed797 100644
+index 9dc03a8fff08111b6a68aa94d658f1e965ef0d25..0f3848bf82f35fa3988267c7bfa18e1b34d97b66 100644
 --- a/net/minecraft/world/ticks/LevelTicks.java
 +++ b/net/minecraft/world/ticks/LevelTicks.java
 @@ -182,7 +182,7 @@ public class LevelTicks<T> implements LevelTickAccess<T> {
diff --git a/leaf-server/minecraft-patches/features/0196-Remove-stream-in-villagers.patch b/leaf-server/minecraft-patches/features/0195-Remove-stream-in-villagers.patch
similarity index 96%
rename from leaf-server/minecraft-patches/features/0196-Remove-stream-in-villagers.patch
rename to leaf-server/minecraft-patches/features/0195-Remove-stream-in-villagers.patch
index 0a79ce25..1b1a21f2 100644
--- a/leaf-server/minecraft-patches/features/0196-Remove-stream-in-villagers.patch
+++ b/leaf-server/minecraft-patches/features/0195-Remove-stream-in-villagers.patch
@@ -41,7 +41,7 @@ index 72cca4897f9697573fd6987a5f0d2df52761b8c3..04eea77cf84aaeb781608e48f2aa32f3
  
      private static void throwHalfStack(Villager villager, Set<Item> stack, LivingEntity entity) {
 diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
-index 174c37fca6b2b03a6eb36d8c7c17b6e8ec49f1cd..a3040736384e54f26794db2bc938d63734f9614d 100644
+index e6a750ab472eba53de1e5f9e2f507f3a0a9d94d4..d3a86b2d9de3be3bdd38682712472b86b90f5661 100644
 --- a/net/minecraft/world/entity/npc/Villager.java
 +++ b/net/minecraft/world/entity/npc/Villager.java
 @@ -973,7 +973,17 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
diff --git a/leaf-server/minecraft-patches/features/0197-Optimize-baby-villager-sensor.patch b/leaf-server/minecraft-patches/features/0196-Optimize-baby-villager-sensor.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0197-Optimize-baby-villager-sensor.patch
rename to leaf-server/minecraft-patches/features/0196-Optimize-baby-villager-sensor.patch
diff --git a/leaf-server/minecraft-patches/features/0198-Only-player-pushable.patch b/leaf-server/minecraft-patches/features/0197-Only-player-pushable.patch
similarity index 96%
rename from leaf-server/minecraft-patches/features/0198-Only-player-pushable.patch
rename to leaf-server/minecraft-patches/features/0197-Only-player-pushable.patch
index cfc6603b..67edd029 100644
--- a/leaf-server/minecraft-patches/features/0198-Only-player-pushable.patch
+++ b/leaf-server/minecraft-patches/features/0197-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 a1efe500e3751e1345d0c5b7671b378a97541f88..6d9d8f85bf6936eee76c3d790dd676aa309a1d46 100644
+index 32f754a4c1d7a91bbbbf4995559ac2858ef10e1c..07bcf0af79a010ae7177672da914b23f6d8d75c5 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
@@ -78,7 +78,7 @@ index a1efe500e3751e1345d0c5b7671b378a97541f88..6d9d8f85bf6936eee76c3d790dd676aa
          AABB aabb = boundingBoxBeforeSpin.minmax(boundingBoxAfterSpin);
          List<Entity> entities = this.level().getEntities(this, aabb);
 diff --git a/net/minecraft/world/entity/decoration/ArmorStand.java b/net/minecraft/world/entity/decoration/ArmorStand.java
-index 83fdd22eeb141079e05018ebf5cef70e7eb78726..4432d4cc842dc4c2a27002f7a2754f419c6bf5b8 100644
+index 95d835ce4c733cbea457427a0d065c05a59704d9..98a1795be167d4ecde25a89ba031827ccbd14483 100644
 --- a/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -205,7 +205,7 @@ public class ArmorStand extends LivingEntity {
diff --git a/leaf-server/minecraft-patches/features/0199-Remove-iterators-from-Inventory.patch b/leaf-server/minecraft-patches/features/0198-Remove-iterators-from-Inventory.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0199-Remove-iterators-from-Inventory.patch
rename to leaf-server/minecraft-patches/features/0198-Remove-iterators-from-Inventory.patch
diff --git a/leaf-server/minecraft-patches/features/0200-optimize-mob-despawn.patch b/leaf-server/minecraft-patches/features/0199-optimize-mob-despawn.patch
similarity index 98%
rename from leaf-server/minecraft-patches/features/0200-optimize-mob-despawn.patch
rename to leaf-server/minecraft-patches/features/0199-optimize-mob-despawn.patch
index 8d329490..57c6da6d 100644
--- a/leaf-server/minecraft-patches/features/0200-optimize-mob-despawn.patch
+++ b/leaf-server/minecraft-patches/features/0199-optimize-mob-despawn.patch
@@ -54,7 +54,7 @@ index 1d75ea57923f891a07b0c29e065ad46cdfac9b91..b87a1a2452cd236b4bdf7a7f12cae03f
          return Leashable.createQuadLeashOffsets(this, 0.0, 0.5, 0.5, 0.0);
      }
 diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
-index 6e0981844823be11775c82e22c6845d8fc6b44e2..9f91295837064accb0a72b9f47d05b01ad51f668 100644
+index b22960f06f92ef4d9d12ab5b3891363534567a29..bb31b5c952152d8c6b9d3868893bb82deda5aa4d 100644
 --- a/net/minecraft/world/entity/Mob.java
 +++ b/net/minecraft/world/entity/Mob.java
 @@ -764,6 +764,22 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
diff --git a/leaf-server/minecraft-patches/features/0201-Slightly-optimise-getNearestPlayer.patch b/leaf-server/minecraft-patches/features/0200-Slightly-optimise-getNearestPlayer.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0201-Slightly-optimise-getNearestPlayer.patch
rename to leaf-server/minecraft-patches/features/0200-Slightly-optimise-getNearestPlayer.patch
diff --git a/leaf-server/minecraft-patches/features/0202-Bulk-writes-to-writeLongArray-during-chunk-loading.patch b/leaf-server/minecraft-patches/features/0201-Bulk-writes-to-writeLongArray-during-chunk-loading.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0202-Bulk-writes-to-writeLongArray-during-chunk-loading.patch
rename to leaf-server/minecraft-patches/features/0201-Bulk-writes-to-writeLongArray-during-chunk-loading.patch
diff --git a/leaf-server/minecraft-patches/features/0203-Improve-sorting-in-SortedArraySet.patch b/leaf-server/minecraft-patches/features/0202-Improve-sorting-in-SortedArraySet.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0203-Improve-sorting-in-SortedArraySet.patch
rename to leaf-server/minecraft-patches/features/0202-Improve-sorting-in-SortedArraySet.patch
diff --git a/leaf-server/minecraft-patches/features/0204-Make-removeIf-slightly-faster.patch b/leaf-server/minecraft-patches/features/0203-Make-removeIf-slightly-faster.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0204-Make-removeIf-slightly-faster.patch
rename to leaf-server/minecraft-patches/features/0203-Make-removeIf-slightly-faster.patch
diff --git a/leaf-server/minecraft-patches/features/0205-Optimize-LinearPalette.patch b/leaf-server/minecraft-patches/features/0204-Optimize-LinearPalette.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0205-Optimize-LinearPalette.patch
rename to leaf-server/minecraft-patches/features/0204-Optimize-LinearPalette.patch
diff --git a/leaf-server/minecraft-patches/features/0206-Slightly-optimized-VarInt-write.patch b/leaf-server/minecraft-patches/features/0205-Slightly-optimized-VarInt-write.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0206-Slightly-optimized-VarInt-write.patch
rename to leaf-server/minecraft-patches/features/0205-Slightly-optimized-VarInt-write.patch
diff --git a/leaf-server/minecraft-patches/features/0207-Rewrite-ClientboundLightUpdatePacketData.patch b/leaf-server/minecraft-patches/features/0206-Rewrite-ClientboundLightUpdatePacketData.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0207-Rewrite-ClientboundLightUpdatePacketData.patch
rename to leaf-server/minecraft-patches/features/0206-Rewrite-ClientboundLightUpdatePacketData.patch
diff --git a/leaf-server/minecraft-patches/features/0208-Async-chunk-sending.patch b/leaf-server/minecraft-patches/features/0207-Async-chunk-sending.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0208-Async-chunk-sending.patch
rename to leaf-server/minecraft-patches/features/0207-Async-chunk-sending.patch
diff --git a/leaf-server/minecraft-patches/features/0209-Spawner-Configurations.patch b/leaf-server/minecraft-patches/features/0208-Spawner-Configurations.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0209-Spawner-Configurations.patch
rename to leaf-server/minecraft-patches/features/0208-Spawner-Configurations.patch
diff --git a/leaf-server/minecraft-patches/features/0210-SparklyPaper-Parallel-world-ticking.patch b/leaf-server/minecraft-patches/features/0209-SparklyPaper-Parallel-world-ticking.patch
similarity index 99%
rename from leaf-server/minecraft-patches/features/0210-SparklyPaper-Parallel-world-ticking.patch
rename to leaf-server/minecraft-patches/features/0209-SparklyPaper-Parallel-world-ticking.patch
index 463f5866..1cd972ff 100644
--- a/leaf-server/minecraft-patches/features/0210-SparklyPaper-Parallel-world-ticking.patch
+++ b/leaf-server/minecraft-patches/features/0209-SparklyPaper-Parallel-world-ticking.patch
@@ -719,7 +719,7 @@ index 50b452c428c637a537c71b70a7758ec3c76ab280..258a90b1a35c2899481c6b37f949670d
          // Paper end - Inventory close reason
          this.connection.send(new ClientboundContainerClosePacket(this.containerMenu.containerId));
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index b5ecb22c95eca2ac3dc8d201e6964f2c34130ae9..d072ad9ae157bb44d344cd0b7e66a0d1ac6ee3dc 100644
+index 92b37775282ca1f35edfc51305b98af5a9adc5cb..52e5a87ed1e425b74f7428798bf0f0564f6747ae 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -257,6 +257,8 @@ public abstract class PlayerList {
@@ -1023,7 +1023,7 @@ index 3614551856c594f3c0cfee984fcf03fad672b007..f4577f908ca9f279b72d89e5b0822d34
          });
          entity.getBrain().eraseMemory(MemoryModuleType.POTENTIAL_JOB_SITE);
 diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
-index a3040736384e54f26794db2bc938d63734f9614d..f456a44deac3645c44366ca1704ae25419baf52c 100644
+index d3a86b2d9de3be3bdd38682712472b86b90f5661..a4fc8d4d17971643921e91438f527a2551d51808 100644
 --- a/net/minecraft/world/entity/npc/Villager.java
 +++ b/net/minecraft/world/entity/npc/Villager.java
 @@ -796,13 +796,21 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
diff --git a/leaf-server/minecraft-patches/features/0211-SparklyPaper-Track-each-world-MSPT.patch b/leaf-server/minecraft-patches/features/0210-SparklyPaper-Track-each-world-MSPT.patch
similarity index 98%
rename from leaf-server/minecraft-patches/features/0211-SparklyPaper-Track-each-world-MSPT.patch
rename to leaf-server/minecraft-patches/features/0210-SparklyPaper-Track-each-world-MSPT.patch
index 62f32b11..f5f3d48f 100644
--- a/leaf-server/minecraft-patches/features/0211-SparklyPaper-Track-each-world-MSPT.patch
+++ b/leaf-server/minecraft-patches/features/0210-SparklyPaper-Track-each-world-MSPT.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] SparklyPaper: Track each world MSPT
 Original project: https://github.com/SparklyPower/SparklyPaper
 
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index c8265f25ead389b025aef6ebe4cc44972132f143..5ad00ebb9e0acab73a8366f0caf06979cfcccca0 100644
+index 20e3c60ccf069ce491df8c5c9ea6ffec7b0920da..01da8faee1bc8d656949106d5f88dea0c1ebfc89 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -1686,7 +1686,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/leaf-server/minecraft-patches/features/0212-Paper-PR-Fix-cancelled-Projectile-Events-still-consu.patch b/leaf-server/minecraft-patches/features/0211-Paper-PR-Fix-cancelled-Projectile-Events-still-consu.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0212-Paper-PR-Fix-cancelled-Projectile-Events-still-consu.patch
rename to leaf-server/minecraft-patches/features/0211-Paper-PR-Fix-cancelled-Projectile-Events-still-consu.patch
diff --git a/leaf-server/minecraft-patches/features/0213-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch b/leaf-server/minecraft-patches/features/0212-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0213-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch
rename to leaf-server/minecraft-patches/features/0212-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch
diff --git a/leaf-server/minecraft-patches/features/0214-rewrite-InsideBrownianWalk.patch b/leaf-server/minecraft-patches/features/0213-rewrite-InsideBrownianWalk.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0214-rewrite-InsideBrownianWalk.patch
rename to leaf-server/minecraft-patches/features/0213-rewrite-InsideBrownianWalk.patch
diff --git a/leaf-server/minecraft-patches/features/0215-Use-BFS-on-getSlopeDistance.patch b/leaf-server/minecraft-patches/features/0214-Use-BFS-on-getSlopeDistance.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0215-Use-BFS-on-getSlopeDistance.patch
rename to leaf-server/minecraft-patches/features/0214-Use-BFS-on-getSlopeDistance.patch
diff --git a/leaf-server/minecraft-patches/features/0216-Paper-PR-Throttle-failed-spawn-attempts.patch b/leaf-server/minecraft-patches/features/0215-Paper-PR-Throttle-failed-spawn-attempts.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0216-Paper-PR-Throttle-failed-spawn-attempts.patch
rename to leaf-server/minecraft-patches/features/0215-Paper-PR-Throttle-failed-spawn-attempts.patch
diff --git a/leaf-server/minecraft-patches/features/0217-Improve-BlockEntity-ticking-isRemoved-check.patch b/leaf-server/minecraft-patches/features/0216-Improve-BlockEntity-ticking-isRemoved-check.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0217-Improve-BlockEntity-ticking-isRemoved-check.patch
rename to leaf-server/minecraft-patches/features/0216-Improve-BlockEntity-ticking-isRemoved-check.patch
diff --git a/leaf-server/minecraft-patches/features/0218-Raytrace-AntiXray-SDK-integration.patch b/leaf-server/minecraft-patches/features/0217-Raytrace-AntiXray-SDK-integration.patch
similarity index 96%
rename from leaf-server/minecraft-patches/features/0218-Raytrace-AntiXray-SDK-integration.patch
rename to leaf-server/minecraft-patches/features/0217-Raytrace-AntiXray-SDK-integration.patch
index 533e01db..accaa639 100644
--- a/leaf-server/minecraft-patches/features/0218-Raytrace-AntiXray-SDK-integration.patch
+++ b/leaf-server/minecraft-patches/features/0217-Raytrace-AntiXray-SDK-integration.patch
@@ -25,7 +25,7 @@ index d638821595138ef972163925136eb57207b31719..02c02314a4a6a7a6da427f0d064dbc61
      }
  
 diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
-index a2abfc5db556bc9a80098a675545f67907a8886b..523b068b99236845e2b87361f72494582e6dd894 100644
+index f881866e460b1361f3691c5a999277673845f64e..38a6ca1c0789e50ca15f7a5e602da9be5f8371e9 100644
 --- a/net/minecraft/world/level/Level.java
 +++ b/net/minecraft/world/level/Level.java
 @@ -1178,6 +1178,12 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
diff --git a/leaf-server/minecraft-patches/features/0219-Optimize-addOrUpdateTransientModifier.patch b/leaf-server/minecraft-patches/features/0218-Optimize-addOrUpdateTransientModifier.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0219-Optimize-addOrUpdateTransientModifier.patch
rename to leaf-server/minecraft-patches/features/0218-Optimize-addOrUpdateTransientModifier.patch
diff --git a/leaf-server/minecraft-patches/features/0220-Optimize-ContextMap.create.patch b/leaf-server/minecraft-patches/features/0219-Optimize-ContextMap.create.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0220-Optimize-ContextMap.create.patch
rename to leaf-server/minecraft-patches/features/0219-Optimize-ContextMap.create.patch
diff --git a/leaf-server/minecraft-patches/features/0221-Micro-optimizations-for-random-tick.patch b/leaf-server/minecraft-patches/features/0220-Micro-optimizations-for-random-tick.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0221-Micro-optimizations-for-random-tick.patch
rename to leaf-server/minecraft-patches/features/0220-Micro-optimizations-for-random-tick.patch
diff --git a/leaf-server/minecraft-patches/features/0222-Remove-streams-on-updateConnectedPlayersWithinRange.patch b/leaf-server/minecraft-patches/features/0221-Remove-streams-on-updateConnectedPlayersWithinRange.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0222-Remove-streams-on-updateConnectedPlayersWithinRange.patch
rename to leaf-server/minecraft-patches/features/0221-Remove-streams-on-updateConnectedPlayersWithinRange.patch
diff --git a/leaf-server/minecraft-patches/features/0223-Remove-streams-on-PlayerDetector.patch b/leaf-server/minecraft-patches/features/0222-Remove-streams-on-PlayerDetector.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0223-Remove-streams-on-PlayerDetector.patch
rename to leaf-server/minecraft-patches/features/0222-Remove-streams-on-PlayerDetector.patch
diff --git a/leaf-server/minecraft-patches/features/0224-Use-direct-iteration-on-Sensing.tick.patch b/leaf-server/minecraft-patches/features/0223-Use-direct-iteration-on-Sensing.tick.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0224-Use-direct-iteration-on-Sensing.tick.patch
rename to leaf-server/minecraft-patches/features/0223-Use-direct-iteration-on-Sensing.tick.patch
diff --git a/leaf-server/minecraft-patches/features/0225-Optimise-non-flush-packet-sending.patch b/leaf-server/minecraft-patches/features/0224-Optimise-non-flush-packet-sending.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0225-Optimise-non-flush-packet-sending.patch
rename to leaf-server/minecraft-patches/features/0224-Optimise-non-flush-packet-sending.patch
diff --git a/leaf-server/minecraft-patches/features/0226-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch b/leaf-server/minecraft-patches/features/0225-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch
similarity index 96%
rename from leaf-server/minecraft-patches/features/0226-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch
rename to leaf-server/minecraft-patches/features/0225-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch
index d34ae1d7..74836bf6 100644
--- a/leaf-server/minecraft-patches/features/0226-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch
+++ b/leaf-server/minecraft-patches/features/0225-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 b1b9bc9be22da5a9a683e907766aaaafee0129ec..bfd486c85942a7d7b3e00724dd08319381222230 100644
+index d3b4c193b82accd424a4201eee2a25b81315ef0c..e4c07980e88b56210566b100a6055e7fb68922e0 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/0227-Null-handling-on-MultifaceSpreader.patch b/leaf-server/minecraft-patches/features/0226-Null-handling-on-MultifaceSpreader.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0227-Null-handling-on-MultifaceSpreader.patch
rename to leaf-server/minecraft-patches/features/0226-Null-handling-on-MultifaceSpreader.patch
diff --git a/leaf-server/minecraft-patches/features/0228-More-virtual-threads.patch b/leaf-server/minecraft-patches/features/0227-More-virtual-threads.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0228-More-virtual-threads.patch
rename to leaf-server/minecraft-patches/features/0227-More-virtual-threads.patch
diff --git a/leaf-server/minecraft-patches/features/0229-Async-target-finding.patch b/leaf-server/minecraft-patches/features/0228-Async-target-finding.patch
similarity index 99%
rename from leaf-server/minecraft-patches/features/0229-Async-target-finding.patch
rename to leaf-server/minecraft-patches/features/0228-Async-target-finding.patch
index db546996..47964263 100644
--- a/leaf-server/minecraft-patches/features/0229-Async-target-finding.patch
+++ b/leaf-server/minecraft-patches/features/0228-Async-target-finding.patch
@@ -195,7 +195,7 @@ index 07bcf0af79a010ae7177672da914b23f6d8d75c5..7303d0ab39919ab199e8786b497a8bb2
  
      @Override
 diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
-index 9f91295837064accb0a72b9f47d05b01ad51f668..9f0f3613732e162f1655f862cbe57bb015ab930a 100644
+index bb31b5c952152d8c6b9d3868893bb82deda5aa4d..52a7e8e3455fd4dcde91e5e538dbfe84728fa536 100644
 --- a/net/minecraft/world/entity/Mob.java
 +++ b/net/minecraft/world/entity/Mob.java
 @@ -139,6 +139,12 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -1974,7 +1974,7 @@ index e1717b5c854aa81fdd7b7e715d7c3498d9f86072..727effd31644432f9da04ee4e3aaa41c
  
      static class StriderPathNavigation extends GroundPathNavigation {
 diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
-index b4f4556511fd801b79111330250cac17003b37b9..06b46b973df84b16842a28f73df75613d09e75c9 100644
+index 38a6ca1c0789e50ca15f7a5e602da9be5f8371e9..72f2613c08f251bf32586d9fd039fdca80f6df02 100644
 --- a/net/minecraft/world/level/Level.java
 +++ b/net/minecraft/world/level/Level.java
 @@ -1793,9 +1793,11 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
diff --git a/leaf-server/minecraft-patches/features/0230-Optimize-ThreadedTicketLevelPropagator.patch b/leaf-server/minecraft-patches/features/0229-Optimize-ThreadedTicketLevelPropagator.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0230-Optimize-ThreadedTicketLevelPropagator.patch
rename to leaf-server/minecraft-patches/features/0229-Optimize-ThreadedTicketLevelPropagator.patch
diff --git a/leaf-server/minecraft-patches/features/0231-Optimise-MobEffectUtil-getDigSpeedAmplification.patch b/leaf-server/minecraft-patches/features/0230-Optimise-MobEffectUtil-getDigSpeedAmplification.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0231-Optimise-MobEffectUtil-getDigSpeedAmplification.patch
rename to leaf-server/minecraft-patches/features/0230-Optimise-MobEffectUtil-getDigSpeedAmplification.patch
diff --git a/leaf-server/minecraft-patches/features/0232-Optimise-chunkUnloads.patch b/leaf-server/minecraft-patches/features/0231-Optimise-chunkUnloads.patch
similarity index 99%
rename from leaf-server/minecraft-patches/features/0232-Optimise-chunkUnloads.patch
rename to leaf-server/minecraft-patches/features/0231-Optimise-chunkUnloads.patch
index 04eb6097..8035215e 100644
--- a/leaf-server/minecraft-patches/features/0232-Optimise-chunkUnloads.patch
+++ b/leaf-server/minecraft-patches/features/0231-Optimise-chunkUnloads.patch
@@ -212,7 +212,7 @@ index 4d06df242ab73411bdefc4770e131b27a6ea668a..fb936344ba363490f2255682678f08e2
      }
  }
 diff --git a/net/minecraft/world/level/chunk/storage/SerializableChunkData.java b/net/minecraft/world/level/chunk/storage/SerializableChunkData.java
-index ab1fc7ca0639f9e71933f623258bb8d123988262..781f9470dc0115a464ce4711aecafb0f11a016b7 100644
+index 2c10d216929fbc7f00385e4baac3aa60c203b799..0ef9e974bc848b5273f002751628a989a2b3627b 100644
 --- a/net/minecraft/world/level/chunk/storage/SerializableChunkData.java
 +++ b/net/minecraft/world/level/chunk/storage/SerializableChunkData.java
 @@ -495,14 +495,16 @@ public record SerializableChunkData(
diff --git a/leaf-server/minecraft-patches/features/0233-Optimize-BlockEntityType-isValid.patch b/leaf-server/minecraft-patches/features/0232-Optimize-BlockEntityType-isValid.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0233-Optimize-BlockEntityType-isValid.patch
rename to leaf-server/minecraft-patches/features/0232-Optimize-BlockEntityType-isValid.patch
diff --git a/leaf-server/minecraft-patches/features/0234-Paper-PR-Add-ticket-on-player-join-to-avoid-chunk-lo.patch b/leaf-server/minecraft-patches/features/0233-Paper-PR-Add-ticket-on-player-join-to-avoid-chunk-lo.patch
similarity index 97%
rename from leaf-server/minecraft-patches/features/0234-Paper-PR-Add-ticket-on-player-join-to-avoid-chunk-lo.patch
rename to leaf-server/minecraft-patches/features/0233-Paper-PR-Add-ticket-on-player-join-to-avoid-chunk-lo.patch
index 96253ff0..62f34eee 100644
--- a/leaf-server/minecraft-patches/features/0234-Paper-PR-Add-ticket-on-player-join-to-avoid-chunk-lo.patch
+++ b/leaf-server/minecraft-patches/features/0233-Paper-PR-Add-ticket-on-player-join-to-avoid-chunk-lo.patch
@@ -27,7 +27,7 @@ index 19b5e4856d471ebfa49335ed19ced767e57df771..9454a71d396128d3c55a0ba550d955af
      public static final int GENERATED_TICKET_LEVEL = ChunkHolderManager.FULL_LOADED_TICKET_LEVEL;
      public static final int LOADED_TICKET_LEVEL = ChunkTaskScheduler.getTicketLevel(ChunkStatus.EMPTY);
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index d072ad9ae157bb44d344cd0b7e66a0d1ac6ee3dc..a3c851177709c382d53d78d0780177eacda625ca 100644
+index 52e5a87ed1e425b74f7428798bf0f0564f6747ae..76e7133c580725635d517bc8dd20aa10210133aa 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -441,6 +441,13 @@ public abstract class PlayerList {
diff --git a/leaf-server/minecraft-patches/features/0235-Sakura-copy-EntityList-implementation-to-BasicEntity.patch b/leaf-server/minecraft-patches/features/0234-Sakura-copy-EntityList-implementation-to-BasicEntity.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0235-Sakura-copy-EntityList-implementation-to-BasicEntity.patch
rename to leaf-server/minecraft-patches/features/0234-Sakura-copy-EntityList-implementation-to-BasicEntity.patch
diff --git a/leaf-server/minecraft-patches/features/0236-Protocol-Core.patch b/leaf-server/minecraft-patches/features/0235-Protocol-Core.patch
similarity index 97%
rename from leaf-server/minecraft-patches/features/0236-Protocol-Core.patch
rename to leaf-server/minecraft-patches/features/0235-Protocol-Core.patch
index 8b92a981..d436cd87 100644
--- a/leaf-server/minecraft-patches/features/0236-Protocol-Core.patch
+++ b/leaf-server/minecraft-patches/features/0235-Protocol-Core.patch
@@ -63,7 +63,7 @@ index 84030c40f2f91b433b3ccd21e0367d2f8b7c97b6..03cd2af813c3cca167b07115f03f6b5e
          final byte[] data = discardedPayload.data();
          try {
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 1fbdf29af349bc9b8f9d3b6a2550f76be0a64ee9..7d1c836f55c16ad6afd135ce167f217bb5f56527 100644
+index 76e7133c580725635d517bc8dd20aa10210133aa..d8bfb169b10bb2a742ecd0f4919db38da77998ad 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -689,6 +689,7 @@ public abstract class PlayerList {
diff --git a/leaf-server/minecraft-patches/features/0237-Async-switch-connection-state.patch b/leaf-server/minecraft-patches/features/0236-Async-switch-connection-state.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0237-Async-switch-connection-state.patch
rename to leaf-server/minecraft-patches/features/0236-Async-switch-connection-state.patch
diff --git a/leaf-server/minecraft-patches/features/0238-Optimize-BlockEntities-tickersInLevel.patch b/leaf-server/minecraft-patches/features/0237-Optimize-BlockEntities-tickersInLevel.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0238-Optimize-BlockEntities-tickersInLevel.patch
rename to leaf-server/minecraft-patches/features/0237-Optimize-BlockEntities-tickersInLevel.patch
diff --git a/leaf-server/minecraft-patches/features/0239-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch b/leaf-server/minecraft-patches/features/0238-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0239-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch
rename to leaf-server/minecraft-patches/features/0238-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch
diff --git a/leaf-server/minecraft-patches/features/0240-Flush-location-while-knockback.patch b/leaf-server/minecraft-patches/features/0239-Flush-location-while-knockback.patch
similarity index 96%
rename from leaf-server/minecraft-patches/features/0240-Flush-location-while-knockback.patch
rename to leaf-server/minecraft-patches/features/0239-Flush-location-while-knockback.patch
index 26b7f38c..7e31dec6 100644
--- a/leaf-server/minecraft-patches/features/0240-Flush-location-while-knockback.patch
+++ b/leaf-server/minecraft-patches/features/0239-Flush-location-while-knockback.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Flush location while knockback
 
 
 diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
-index 6c9dfd76596b2e890b0b0dad5d98e8785a68c5a1..731f50fa6786557db0a1745442b2ad61a6685375 100644
+index 5841fc8c069286321dcc03e000049d7c88a3d3b6..7c87ae05c4932fb53ce395257994bcef031337b7 100644
 --- a/net/minecraft/world/entity/player/Player.java
 +++ b/net/minecraft/world/entity/player/Player.java
 @@ -1363,6 +1363,13 @@ public abstract class Player extends LivingEntity {
diff --git a/leaf-server/minecraft-patches/features/0241-Only-tick-items-at-hand.patch b/leaf-server/minecraft-patches/features/0240-Only-tick-items-at-hand.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0241-Only-tick-items-at-hand.patch
rename to leaf-server/minecraft-patches/features/0240-Only-tick-items-at-hand.patch
diff --git a/leaf-server/minecraft-patches/features/0242-Smart-sort-items-in-NearestItemSensor.patch b/leaf-server/minecraft-patches/features/0241-Smart-sort-items-in-NearestItemSensor.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0242-Smart-sort-items-in-NearestItemSensor.patch
rename to leaf-server/minecraft-patches/features/0241-Smart-sort-items-in-NearestItemSensor.patch
diff --git a/leaf-server/minecraft-patches/features/0243-Optimise-player-movement-checks.patch b/leaf-server/minecraft-patches/features/0242-Optimise-player-movement-checks.patch
similarity index 90%
rename from leaf-server/minecraft-patches/features/0243-Optimise-player-movement-checks.patch
rename to leaf-server/minecraft-patches/features/0242-Optimise-player-movement-checks.patch
index b6b543f7..0f428419 100644
--- a/leaf-server/minecraft-patches/features/0243-Optimise-player-movement-checks.patch
+++ b/leaf-server/minecraft-patches/features/0242-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 bfd486c85942a7d7b3e00724dd08319381222230..f70fff36ba616afbd1869caeee1b20d4c1579a19 100644
+index e4c07980e88b56210566b100a6055e7fb68922e0..ab0cf0bff7b477327fd92a20e6c7bc7d62f418d2 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/0244-Remove-streams-in-MobSensor.patch b/leaf-server/minecraft-patches/features/0243-Remove-streams-in-MobSensor.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0244-Remove-streams-in-MobSensor.patch
rename to leaf-server/minecraft-patches/features/0243-Remove-streams-in-MobSensor.patch
diff --git a/leaf-server/minecraft-patches/features/0245-Remove-streams-in-TemptingSensor.patch b/leaf-server/minecraft-patches/features/0244-Remove-streams-in-TemptingSensor.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0245-Remove-streams-in-TemptingSensor.patch
rename to leaf-server/minecraft-patches/features/0244-Remove-streams-in-TemptingSensor.patch
diff --git a/leaf-server/minecraft-patches/features/0246-Use-HashedList-on-WeightedList.patch b/leaf-server/minecraft-patches/features/0245-Use-HashedList-on-WeightedList.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0246-Use-HashedList-on-WeightedList.patch
rename to leaf-server/minecraft-patches/features/0245-Use-HashedList-on-WeightedList.patch
diff --git a/leaf-server/minecraft-patches/features/0247-Add-configurable-death-item-drop-knockback-settings.patch b/leaf-server/minecraft-patches/features/0246-Add-configurable-death-item-drop-knockback-settings.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0247-Add-configurable-death-item-drop-knockback-settings.patch
rename to leaf-server/minecraft-patches/features/0246-Add-configurable-death-item-drop-knockback-settings.patch
diff --git a/leaf-server/minecraft-patches/features/0248-Optimize-getScaledTrackingDistance.patch b/leaf-server/minecraft-patches/features/0247-Optimize-getScaledTrackingDistance.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0248-Optimize-getScaledTrackingDistance.patch
rename to leaf-server/minecraft-patches/features/0247-Optimize-getScaledTrackingDistance.patch
diff --git a/leaf-server/minecraft-patches/features/0249-Optimize-SynchedEntityData-packDirty.patch b/leaf-server/minecraft-patches/features/0248-Optimize-SynchedEntityData-packDirty.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0249-Optimize-SynchedEntityData-packDirty.patch
rename to leaf-server/minecraft-patches/features/0248-Optimize-SynchedEntityData-packDirty.patch
diff --git a/leaf-server/minecraft-patches/features/0250-Optimize-isEyeInFluid.patch b/leaf-server/minecraft-patches/features/0249-Optimize-isEyeInFluid.patch
similarity index 99%
rename from leaf-server/minecraft-patches/features/0250-Optimize-isEyeInFluid.patch
rename to leaf-server/minecraft-patches/features/0249-Optimize-isEyeInFluid.patch
index 67cdc94b..4ea79c43 100644
--- a/leaf-server/minecraft-patches/features/0250-Optimize-isEyeInFluid.patch
+++ b/leaf-server/minecraft-patches/features/0249-Optimize-isEyeInFluid.patch
@@ -240,7 +240,7 @@ index 4b253ae8149f5d9505c5140a00a96d8c8850b1c4..bfb0e3381abb93bea1079fb0d476cf85
                  } else if (this.random.nextFloat() < 0.15F
                      && (this.isOnFire() || this.getLastDamageSource() != null && this.getLastDamageSource().is(DamageTypeTags.IS_FIRE))
 diff --git a/net/minecraft/world/entity/monster/Zombie.java b/net/minecraft/world/entity/monster/Zombie.java
-index 5563720a6d92cad974632bdc97bb35c15310483c..b65dfebab222d2fbc4b68367bbe722447d85d5fa 100644
+index 202dca0a106a1610d8e58b7e9ba0c612998dd868..c27aa33e667abd89c10708f64b172efdf2f07a60 100644
 --- a/net/minecraft/world/entity/monster/Zombie.java
 +++ b/net/minecraft/world/entity/monster/Zombie.java
 @@ -286,7 +286,7 @@ public class Zombie extends Monster {
diff --git a/leaf-server/minecraft-patches/features/0251-Cache-block-path-type.patch b/leaf-server/minecraft-patches/features/0250-Cache-block-path-type.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0251-Cache-block-path-type.patch
rename to leaf-server/minecraft-patches/features/0250-Cache-block-path-type.patch
diff --git a/leaf-server/minecraft-patches/features/0252-optimize-getEntityStatus.patch b/leaf-server/minecraft-patches/features/0251-optimize-getEntityStatus.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0252-optimize-getEntityStatus.patch
rename to leaf-server/minecraft-patches/features/0251-optimize-getEntityStatus.patch
diff --git a/leaf-server/minecraft-patches/features/0253-Rail-Optimization-optimized-PoweredRailBlock-logic.patch b/leaf-server/minecraft-patches/features/0252-Rail-Optimization-optimized-PoweredRailBlock-logic.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0253-Rail-Optimization-optimized-PoweredRailBlock-logic.patch
rename to leaf-server/minecraft-patches/features/0252-Rail-Optimization-optimized-PoweredRailBlock-logic.patch
diff --git a/leaf-server/minecraft-patches/features/0254-optimise-ChunkGenerator-getMobsAt.patch b/leaf-server/minecraft-patches/features/0253-optimise-ChunkGenerator-getMobsAt.patch
similarity index 97%
rename from leaf-server/minecraft-patches/features/0254-optimise-ChunkGenerator-getMobsAt.patch
rename to leaf-server/minecraft-patches/features/0253-optimise-ChunkGenerator-getMobsAt.patch
index e1bcee84..e42666a1 100644
--- a/leaf-server/minecraft-patches/features/0254-optimise-ChunkGenerator-getMobsAt.patch
+++ b/leaf-server/minecraft-patches/features/0253-optimise-ChunkGenerator-getMobsAt.patch
@@ -30,7 +30,7 @@ index 3399922d79a713484e16beb6e4e9985c284ddfb5..fbe93098ce0366054a6da857cd808af1
  
      public StructureCheckResult checkStructurePresence(ChunkPos chunkPos, Structure structure, StructurePlacement placement, boolean skipKnownStructures) {
 diff --git a/net/minecraft/world/level/chunk/ChunkGenerator.java b/net/minecraft/world/level/chunk/ChunkGenerator.java
-index e1ebbfab87aed9cc633f2fedb1e6edeca4ddc2ec..11c7c299d4affb9e78488590e7db939efe6e3dd9 100644
+index a95a4b39604e3200b69093165a2c48efa3f165ab..fb77cd58542c1a690cbeaa6ed3a4d657de6e619d 100644
 --- a/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/net/minecraft/world/level/chunk/ChunkGenerator.java
 @@ -496,18 +496,20 @@ public abstract class ChunkGenerator {
diff --git a/leaf-server/minecraft-patches/features/0255-cache-getBiome.patch b/leaf-server/minecraft-patches/features/0254-cache-getBiome.patch
similarity index 99%
rename from leaf-server/minecraft-patches/features/0255-cache-getBiome.patch
rename to leaf-server/minecraft-patches/features/0254-cache-getBiome.patch
index 09abfaf1..1b5a645d 100644
--- a/leaf-server/minecraft-patches/features/0255-cache-getBiome.patch
+++ b/leaf-server/minecraft-patches/features/0254-cache-getBiome.patch
@@ -35,7 +35,7 @@ index 0842fd6488c8b27d98c4344e1244996b4c0e9912..55c7f7486c293d4434b7e3facdbef034
          int floor = Mth.floor(aabb.minX);
          int floor1 = Mth.floor(aabb.maxX);
 diff --git a/net/minecraft/world/level/NaturalSpawner.java b/net/minecraft/world/level/NaturalSpawner.java
-index a2da4fce50f31d56036d04041c4f80ed90c18b27..81e176d17fb072f9ee531639abfe42134ae833a9 100644
+index 838146e997a2033c3d2a96602a252178093d263e..bb655318f49242858e2c25d5469705c0c314ed85 100644
 --- a/net/minecraft/world/level/NaturalSpawner.java
 +++ b/net/minecraft/world/level/NaturalSpawner.java
 @@ -443,7 +443,7 @@ public final class NaturalSpawner {
diff --git a/leaf-server/minecraft-patches/features/0256-optimize-mob-spawning.patch b/leaf-server/minecraft-patches/features/0255-optimize-mob-spawning.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0256-optimize-mob-spawning.patch
rename to leaf-server/minecraft-patches/features/0255-optimize-mob-spawning.patch
diff --git a/leaf-server/minecraft-patches/features/0257-optimize-structure-map.patch b/leaf-server/minecraft-patches/features/0256-optimize-structure-map.patch
similarity index 96%
rename from leaf-server/minecraft-patches/features/0257-optimize-structure-map.patch
rename to leaf-server/minecraft-patches/features/0256-optimize-structure-map.patch
index bd2e07e9..4588c575 100644
--- a/leaf-server/minecraft-patches/features/0257-optimize-structure-map.patch
+++ b/leaf-server/minecraft-patches/features/0256-optimize-structure-map.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] optimize structure map
 
 
 diff --git a/net/minecraft/world/level/chunk/ChunkAccess.java b/net/minecraft/world/level/chunk/ChunkAccess.java
-index d7dbe7d24a6697be6b5db729f940b16b74838d11..a294e64df092e29aec79429031afce4c97ec28d0 100644
+index 7fc5e56586f2fe8ea1a7437b42da893383878880..585765134da9d99e994e9ac250c7c757d33b3698 100644
 --- a/net/minecraft/world/level/chunk/ChunkAccess.java
 +++ b/net/minecraft/world/level/chunk/ChunkAccess.java
 @@ -77,8 +77,8 @@ public abstract class ChunkAccess implements BiomeManager.NoiseBiomeSource, Ligh
diff --git a/leaf-server/minecraft-patches/features/0258-throttle-mob-spawning.patch b/leaf-server/minecraft-patches/features/0257-throttle-mob-spawning.patch
similarity index 94%
rename from leaf-server/minecraft-patches/features/0258-throttle-mob-spawning.patch
rename to leaf-server/minecraft-patches/features/0257-throttle-mob-spawning.patch
index 1d4bab87..1707cdfa 100644
--- a/leaf-server/minecraft-patches/features/0258-throttle-mob-spawning.patch
+++ b/leaf-server/minecraft-patches/features/0257-throttle-mob-spawning.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] throttle mob spawning
 
 
 diff --git a/net/minecraft/world/level/NaturalSpawner.java b/net/minecraft/world/level/NaturalSpawner.java
-index c3284577437412e1c3fb891bee2b0e20b52ccd59..bb5b51b661542996c5a3dce2dc873bf198a89745 100644
+index f0b78c6d89cd3010a0b8e9fbe760f615d7b8771e..3a54fa25bf491902235392168a00c17378e01c0d 100644
 --- a/net/minecraft/world/level/NaturalSpawner.java
 +++ b/net/minecraft/world/level/NaturalSpawner.java
 @@ -217,6 +217,17 @@ public final class NaturalSpawner {
diff --git a/leaf-server/minecraft-patches/features/0259-Add-BlockExplosionHitEvent.patch b/leaf-server/minecraft-patches/features/0258-Add-BlockExplosionHitEvent.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0259-Add-BlockExplosionHitEvent.patch
rename to leaf-server/minecraft-patches/features/0258-Add-BlockExplosionHitEvent.patch
diff --git a/leaf-server/minecraft-patches/features/0260-Old-Blast-Protection-explosion-knockback.patch b/leaf-server/minecraft-patches/features/0259-Old-Blast-Protection-explosion-knockback.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0260-Old-Blast-Protection-explosion-knockback.patch
rename to leaf-server/minecraft-patches/features/0259-Old-Blast-Protection-explosion-knockback.patch
diff --git a/leaf-server/minecraft-patches/features/0261-Use-UUID-for-cure-reputation.patch b/leaf-server/minecraft-patches/features/0260-Use-UUID-for-cure-reputation.patch
similarity index 96%
rename from leaf-server/minecraft-patches/features/0261-Use-UUID-for-cure-reputation.patch
rename to leaf-server/minecraft-patches/features/0260-Use-UUID-for-cure-reputation.patch
index feaeb4a9..588de15a 100644
--- a/leaf-server/minecraft-patches/features/0261-Use-UUID-for-cure-reputation.patch
+++ b/leaf-server/minecraft-patches/features/0260-Use-UUID-for-cure-reputation.patch
@@ -22,7 +22,7 @@ index 22c1545a0329d56e0ec41ae4da1e1922aa1f9737..e89e4c26c40cbb3ef002022f22886d5f
                  }
  
 diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
-index f456a44deac3645c44366ca1704ae25419baf52c..db23240fed3fb8b9bc2a7f670d7bfd8ab80ffcd6 100644
+index a4fc8d4d17971643921e91438f527a2551d51808..b0c7bd4c38561194edfa003a1fc942a6fab5ce72 100644
 --- a/net/minecraft/world/entity/npc/Villager.java
 +++ b/net/minecraft/world/entity/npc/Villager.java
 @@ -1094,6 +1094,21 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
diff --git a/leaf-server/minecraft-patches/features/0262-Fix-crash-during-parsing-unknown-command-message.patch b/leaf-server/minecraft-patches/features/0261-Fix-crash-during-parsing-unknown-command-message.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0262-Fix-crash-during-parsing-unknown-command-message.patch
rename to leaf-server/minecraft-patches/features/0261-Fix-crash-during-parsing-unknown-command-message.patch
diff --git a/leaf-server/minecraft-patches/features/0263-optimize-random-tick.patch b/leaf-server/minecraft-patches/features/0262-optimize-random-tick.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0263-optimize-random-tick.patch
rename to leaf-server/minecraft-patches/features/0262-optimize-random-tick.patch
diff --git a/leaf-server/minecraft-patches/features/0264-do-not-log-invalid-flatten-text-component-parse.patch b/leaf-server/minecraft-patches/features/0263-do-not-log-invalid-flatten-text-component-parse.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0264-do-not-log-invalid-flatten-text-component-parse.patch
rename to leaf-server/minecraft-patches/features/0263-do-not-log-invalid-flatten-text-component-parse.patch
diff --git a/leaf-server/minecraft-patches/features/0265-Fast-BiomeManager-seed-obfuscation.patch b/leaf-server/minecraft-patches/features/0264-Fast-BiomeManager-seed-obfuscation.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0265-Fast-BiomeManager-seed-obfuscation.patch
rename to leaf-server/minecraft-patches/features/0264-Fast-BiomeManager-seed-obfuscation.patch
diff --git a/leaf-server/minecraft-patches/features/0266-Replace-EntitySelectorOptions-map-with-optimized-col.patch b/leaf-server/minecraft-patches/features/0265-Replace-EntitySelectorOptions-map-with-optimized-col.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0266-Replace-EntitySelectorOptions-map-with-optimized-col.patch
rename to leaf-server/minecraft-patches/features/0265-Replace-EntitySelectorOptions-map-with-optimized-col.patch
diff --git a/leaf-server/minecraft-patches/features/0267-optimize-no-action-time.patch b/leaf-server/minecraft-patches/features/0266-optimize-no-action-time.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0267-optimize-no-action-time.patch
rename to leaf-server/minecraft-patches/features/0266-optimize-no-action-time.patch
diff --git a/leaf-server/minecraft-patches/features/0268-optimize-waypoint.patch b/leaf-server/minecraft-patches/features/0267-optimize-waypoint.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0268-optimize-waypoint.patch
rename to leaf-server/minecraft-patches/features/0267-optimize-waypoint.patch
diff --git a/leaf-server/minecraft-patches/features/0269-Paw-optimization.patch b/leaf-server/minecraft-patches/features/0268-Paw-optimization.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0269-Paw-optimization.patch
rename to leaf-server/minecraft-patches/features/0268-Paw-optimization.patch
diff --git a/leaf-server/minecraft-patches/features/0270-Fix-Paper-config-fixClimbingBypassingCrammingRule.patch b/leaf-server/minecraft-patches/features/0269-Fix-Paper-config-fixClimbingBypassingCrammingRule.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0270-Fix-Paper-config-fixClimbingBypassingCrammingRule.patch
rename to leaf-server/minecraft-patches/features/0269-Fix-Paper-config-fixClimbingBypassingCrammingRule.patch
diff --git a/leaf-server/minecraft-patches/features/0271-Skip-inactive-entity-for-execute.patch b/leaf-server/minecraft-patches/features/0270-Skip-inactive-entity-for-execute.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0271-Skip-inactive-entity-for-execute.patch
rename to leaf-server/minecraft-patches/features/0270-Skip-inactive-entity-for-execute.patch
diff --git a/leaf-server/minecraft-patches/features/0272-Optimise-getEntities.patch b/leaf-server/minecraft-patches/features/0271-Optimise-getEntities.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0272-Optimise-getEntities.patch
rename to leaf-server/minecraft-patches/features/0271-Optimise-getEntities.patch
diff --git a/leaf-server/minecraft-patches/features/0273-fix-MC-298464.patch b/leaf-server/minecraft-patches/features/0272-fix-MC-298464.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0273-fix-MC-298464.patch
rename to leaf-server/minecraft-patches/features/0272-fix-MC-298464.patch
diff --git a/leaf-server/minecraft-patches/features/0274-Re-route-SetClosestHomeAsWalkTarget-s-poi-finding-to.patch b/leaf-server/minecraft-patches/features/0273-Re-route-SetClosestHomeAsWalkTarget-s-poi-finding-to.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0274-Re-route-SetClosestHomeAsWalkTarget-s-poi-finding-to.patch
rename to leaf-server/minecraft-patches/features/0273-Re-route-SetClosestHomeAsWalkTarget-s-poi-finding-to.patch
diff --git a/leaf-server/minecraft-patches/features/0275-optimize-checkInsideBlocks-calls.patch b/leaf-server/minecraft-patches/features/0274-optimize-checkInsideBlocks-calls.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0275-optimize-checkInsideBlocks-calls.patch
rename to leaf-server/minecraft-patches/features/0274-optimize-checkInsideBlocks-calls.patch
diff --git a/leaf-server/minecraft-patches/features/0276-Op-lock.patch b/leaf-server/minecraft-patches/features/0275-Op-lock.patch
similarity index 83%
rename from leaf-server/minecraft-patches/features/0276-Op-lock.patch
rename to leaf-server/minecraft-patches/features/0275-Op-lock.patch
index 08ee68e0..84b6628b 100644
--- a/leaf-server/minecraft-patches/features/0276-Op-lock.patch
+++ b/leaf-server/minecraft-patches/features/0275-Op-lock.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Op lock
 
 
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 7d1c836f55c16ad6afd135ce167f217bb5f56527..bf27a86a3764dbc8132a26ce4adafa9e9ed0f27f 100644
+index d8bfb169b10bb2a742ecd0f4919db38da77998ad..aa5d6309b2194174ddc3163ce8b3839e59805f06 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -1210,6 +1210,9 @@ public abstract class PlayerList {
+@@ -1201,6 +1201,9 @@ public abstract class PlayerList {
      }
  
      public void op(GameProfile profile) {
@@ -18,7 +18,7 @@ index 7d1c836f55c16ad6afd135ce167f217bb5f56527..bf27a86a3764dbc8132a26ce4adafa9e
          this.ops.add(new ServerOpListEntry(profile, this.server.getOperatorUserPermissionLevel(), this.ops.canBypassPlayerLimit(profile)));
          ServerPlayer player = this.getPlayer(profile.getId());
          if (player != null) {
-@@ -1218,6 +1221,9 @@ public abstract class PlayerList {
+@@ -1209,6 +1212,9 @@ public abstract class PlayerList {
      }
  
      public void deop(GameProfile profile) {
diff --git a/leaf-server/minecraft-patches/features/0277-Custom-NonNullList.patch b/leaf-server/minecraft-patches/features/0276-Custom-NonNullList.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0277-Custom-NonNullList.patch
rename to leaf-server/minecraft-patches/features/0276-Custom-NonNullList.patch
diff --git a/leaf-server/minecraft-patches/features/0278-Optimise-TextColor.patch b/leaf-server/minecraft-patches/features/0277-Optimise-TextColor.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0278-Optimise-TextColor.patch
rename to leaf-server/minecraft-patches/features/0277-Optimise-TextColor.patch
diff --git a/leaf-server/minecraft-patches/features/0279-Do-not-create-fire-if-explosion-was-cancelled.patch b/leaf-server/minecraft-patches/features/0278-Do-not-create-fire-if-explosion-was-cancelled.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0279-Do-not-create-fire-if-explosion-was-cancelled.patch
rename to leaf-server/minecraft-patches/features/0278-Do-not-create-fire-if-explosion-was-cancelled.patch
diff --git a/leaf-server/minecraft-patches/features/0280-Skip-BlockPhysicsEvent-if-no-listeners.patch b/leaf-server/minecraft-patches/features/0279-Skip-BlockPhysicsEvent-if-no-listeners.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0280-Skip-BlockPhysicsEvent-if-no-listeners.patch
rename to leaf-server/minecraft-patches/features/0279-Skip-BlockPhysicsEvent-if-no-listeners.patch