diff --git a/README.md b/README.md
index a9ba6d8e..2ecd018e 100644
--- a/README.md
+++ b/README.md
@@ -100,7 +100,6 @@ If these excellent projects hadn't appeared, Leaf wouldn't have become great.
     <p>
       • <a href="https://github.com/KeYiMC/KeYi">KeYi</a> (R.I.P.)
         <a href="https://github.com/MikuMC/KeYiBackup">(Backup)</a><br>
-      • <a href="https://github.com/lynxplay/ktp">KTP</a><br>
       • <a href="https://github.com/etil2jz/Mirai">Mirai</a><br>
       • <a href="https://github.com/Bloom-host/Petal">Petal</a><br>
       • <a href="https://github.com/fxmorin/carpet-fixes">Carpet Fixes</a><br>
diff --git a/patches/api/0008-KeYi-Player-Skull-API.patch b/patches/api/0007-KeYi-Player-Skull-API.patch
similarity index 100%
rename from patches/api/0008-KeYi-Player-Skull-API.patch
rename to patches/api/0007-KeYi-Player-Skull-API.patch
diff --git a/patches/api/0009-Slice-Smooth-Teleports.patch b/patches/api/0008-Slice-Smooth-Teleports.patch
similarity index 93%
rename from patches/api/0009-Slice-Smooth-Teleports.patch
rename to patches/api/0008-Slice-Smooth-Teleports.patch
index 6b3de358..cac81044 100644
--- a/patches/api/0009-Slice-Smooth-Teleports.patch
+++ b/patches/api/0008-Slice-Smooth-Teleports.patch
@@ -7,7 +7,7 @@ Original license: MIT
 Original project: https://github.com/Cryptite/Slice
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index ed13846486a649afa801e4063d2a6128081691d9..62af8f4bafa7b02cc71c1b0c24656284165fc36d 100644
+index d5df69a2e5b228545dfaaaa98ce88ec0da806315..a6d43ac0ee1b4bac6efc3283c7eea643a45e2d93 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3691,6 +3691,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0010-Configurable-LibraryLoader-maven-repos.patch b/patches/api/0009-Configurable-LibraryLoader-maven-repos.patch
similarity index 100%
rename from patches/api/0010-Configurable-LibraryLoader-maven-repos.patch
rename to patches/api/0009-Configurable-LibraryLoader-maven-repos.patch
diff --git a/patches/api/0011-Paper-PR-Optimise-color-distance-check-in-MapPalette.patch b/patches/api/0010-Paper-PR-Optimise-color-distance-check-in-MapPalette.patch
similarity index 100%
rename from patches/api/0011-Paper-PR-Optimise-color-distance-check-in-MapPalette.patch
rename to patches/api/0010-Paper-PR-Optimise-color-distance-check-in-MapPalette.patch
diff --git a/patches/api/0007-KTP-Allow-unknown-event-thread-execution.patch b/patches/removed/api/0007-KTP-Allow-unknown-event-thread-execution.patch
similarity index 99%
rename from patches/api/0007-KTP-Allow-unknown-event-thread-execution.patch
rename to patches/removed/api/0007-KTP-Allow-unknown-event-thread-execution.patch
index ed71c64f..de560f74 100644
--- a/patches/api/0007-KTP-Allow-unknown-event-thread-execution.patch
+++ b/patches/removed/api/0007-KTP-Allow-unknown-event-thread-execution.patch
@@ -3,6 +3,8 @@ From: Bjarne Koll <lynxplay101@gmail.com>
 Date: Thu, 9 Dec 2021 01:53:30 +0100
 Subject: [PATCH] KTP: Allow unknown event thread execution
 
+Removed since 1.21.1
+
 Original license: GPL v3
 Original project: https://github.com/lynxplay/ktp
 
diff --git a/patches/server/0020-KTP-Allow-unknown-event-thread-execution.patch b/patches/removed/server/0020-KTP-Allow-unknown-event-thread-execution.patch
similarity index 98%
rename from patches/server/0020-KTP-Allow-unknown-event-thread-execution.patch
rename to patches/removed/server/0020-KTP-Allow-unknown-event-thread-execution.patch
index e06566c2..40db946e 100644
--- a/patches/server/0020-KTP-Allow-unknown-event-thread-execution.patch
+++ b/patches/removed/server/0020-KTP-Allow-unknown-event-thread-execution.patch
@@ -3,6 +3,8 @@ From: Bjarne Koll <lynxplay101@gmail.com>
 Date: Sun, 19 Feb 2023 16:14:28 +0100
 Subject: [PATCH] KTP: Allow unknown event thread execution
 
+Removed since 1.21.1
+
 Original license: GPL v3
 Original project: https://github.com/lynxplay/ktp
 
diff --git a/patches/server/0021-KeYi-Player-Skull-API.patch b/patches/server/0020-KeYi-Player-Skull-API.patch
similarity index 95%
rename from patches/server/0021-KeYi-Player-Skull-API.patch
rename to patches/server/0020-KeYi-Player-Skull-API.patch
index 99bda75f..fa6a3e5b 100644
--- a/patches/server/0021-KeYi-Player-Skull-API.patch
+++ b/patches/server/0020-KeYi-Player-Skull-API.patch
@@ -7,7 +7,7 @@ Original license: MIT
 Original project: https://github.com/KeYiMC/KeYi
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e3100e65fea02374d4393bab48d63ddeaecef0ab..1f70d832b0287f446722745a65062813e84be566 100644
+index 37fc08d04ff3514d27ad25c8d774a6e96b30c3b1..d57cb8e3fec8db07dea328abeada47829eda111c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3649,4 +3649,31 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0022-KeYi-Disable-arrow-despawn-counter-by-default.patch b/patches/server/0021-KeYi-Disable-arrow-despawn-counter-by-default.patch
similarity index 100%
rename from patches/server/0022-KeYi-Disable-arrow-despawn-counter-by-default.patch
rename to patches/server/0021-KeYi-Disable-arrow-despawn-counter-by-default.patch
diff --git a/patches/server/0023-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch b/patches/server/0022-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch
similarity index 95%
rename from patches/server/0023-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch
rename to patches/server/0022-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch
index 9bbfa1cc..95a9cc45 100644
--- a/patches/server/0023-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch
+++ b/patches/server/0022-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch
@@ -7,7 +7,7 @@ Original license: MIT
 Original project: https://github.com/KeYiMC/KeYi
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index f096a9023fe0b54160e957dd5c6baa489ed0c410..7db0a4b53f27622ad2fd85a451613fc83ea87052 100644
+index 9ef292d75160089b278ee38d41f65aeb221ea600..1ffd3e8e4d637d4a9f83320b8232d28f482ce281 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -357,7 +357,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
diff --git a/patches/server/0024-Carpet-Fixes-Optimized-getBiome-method.patch b/patches/server/0023-Carpet-Fixes-Optimized-getBiome-method.patch
similarity index 100%
rename from patches/server/0024-Carpet-Fixes-Optimized-getBiome-method.patch
rename to patches/server/0023-Carpet-Fixes-Optimized-getBiome-method.patch
diff --git a/patches/server/0025-Carpet-Fixes-Use-optimized-RecipeManager.patch b/patches/server/0024-Carpet-Fixes-Use-optimized-RecipeManager.patch
similarity index 100%
rename from patches/server/0025-Carpet-Fixes-Use-optimized-RecipeManager.patch
rename to patches/server/0024-Carpet-Fixes-Use-optimized-RecipeManager.patch
diff --git a/patches/server/0026-Rail-Optimization-optimized-PoweredRailBlock-logic.patch b/patches/server/0025-Rail-Optimization-optimized-PoweredRailBlock-logic.patch
similarity index 100%
rename from patches/server/0026-Rail-Optimization-optimized-PoweredRailBlock-logic.patch
rename to patches/server/0025-Rail-Optimization-optimized-PoweredRailBlock-logic.patch
diff --git a/patches/server/0027-Akarin-Save-Json-list-asynchronously.patch b/patches/server/0026-Akarin-Save-Json-list-asynchronously.patch
similarity index 100%
rename from patches/server/0027-Akarin-Save-Json-list-asynchronously.patch
rename to patches/server/0026-Akarin-Save-Json-list-asynchronously.patch
diff --git a/patches/server/0028-Slice-Smooth-Teleports.patch b/patches/server/0027-Slice-Smooth-Teleports.patch
similarity index 97%
rename from patches/server/0028-Slice-Smooth-Teleports.patch
rename to patches/server/0027-Slice-Smooth-Teleports.patch
index 60635128..f0b7d657 100644
--- a/patches/server/0028-Slice-Smooth-Teleports.patch
+++ b/patches/server/0027-Slice-Smooth-Teleports.patch
@@ -7,7 +7,7 @@ Original license: MIT
 Original project: https://github.com/Cryptite/Slice
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e6d22346d37261751563b039ae2ad8629ff83d8e..d05f687cc2a765058c8eabfcb50d1cc84a13073d 100644
+index 1dc2af59bafa5a5dc6721da02cde19a3ca77af28..b2ae3fdf128e7d66e3f3430266321a6a09fa0be6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -307,6 +307,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
diff --git a/patches/server/0029-Parchment-Make-FixLight-use-action-bar.patch b/patches/server/0028-Parchment-Make-FixLight-use-action-bar.patch
similarity index 100%
rename from patches/server/0029-Parchment-Make-FixLight-use-action-bar.patch
rename to patches/server/0028-Parchment-Make-FixLight-use-action-bar.patch
diff --git a/patches/server/0030-Leaves-Server-Utils.patch b/patches/server/0029-Leaves-Server-Utils.patch
similarity index 100%
rename from patches/server/0030-Leaves-Server-Utils.patch
rename to patches/server/0029-Leaves-Server-Utils.patch
diff --git a/patches/server/0031-Leaves-Protocol-Core.patch b/patches/server/0030-Leaves-Protocol-Core.patch
similarity index 99%
rename from patches/server/0031-Leaves-Protocol-Core.patch
rename to patches/server/0030-Leaves-Protocol-Core.patch
index e134b10f..a78d6413 100644
--- a/patches/server/0031-Leaves-Protocol-Core.patch
+++ b/patches/server/0030-Leaves-Protocol-Core.patch
@@ -86,7 +86,7 @@ index b66fdb789fcb460d63fd81540112d655c9a0c3f2..ae0d0310d50f1ada082e045a58a24a43
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t register custom payload", ex);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b309541c4a29015ad51e05bb341462bcf247f1eb..3f127b7ca317c14ffeb1d8c3440848ad06efd5c8 100644
+index 6bf9d97992b17aa985e16d9367b64bbe1b0b6dfe..8e8346394ba5c48c551050725decbb7f6a91098a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -363,6 +363,8 @@ public abstract class PlayerList {
@@ -107,7 +107,7 @@ index b309541c4a29015ad51e05bb341462bcf247f1eb..3f127b7ca317c14ffeb1d8c3440848ad
          org.purpurmc.purpur.task.BossBarTask.removeFromAll(entityplayer.getBukkitEntity()); // Purpur
          ServerLevel worldserver = entityplayer.serverLevel();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0eba5c69b36416dab175b73ada52a738700cdc3b..d8559e5b4bb1e3781a394277f5c242a2ea7ca16c 100644
+index 5bb054398651fedc99c5bb454e638ba3a694b9c8..07fcea774aa13d5d5dc9b5db7f515d5bf05df1ce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -493,6 +493,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0032-Leaves-Jade-Protocol.patch b/patches/server/0031-Leaves-Jade-Protocol.patch
similarity index 100%
rename from patches/server/0032-Leaves-Jade-Protocol.patch
rename to patches/server/0031-Leaves-Jade-Protocol.patch
diff --git a/patches/server/0033-Leaves-Appleskin-Protocol.patch b/patches/server/0032-Leaves-Appleskin-Protocol.patch
similarity index 100%
rename from patches/server/0033-Leaves-Appleskin-Protocol.patch
rename to patches/server/0032-Leaves-Appleskin-Protocol.patch
diff --git a/patches/server/0034-Leaves-Xaero-Map-Protocol.patch b/patches/server/0033-Leaves-Xaero-Map-Protocol.patch
similarity index 100%
rename from patches/server/0034-Leaves-Xaero-Map-Protocol.patch
rename to patches/server/0033-Leaves-Xaero-Map-Protocol.patch
diff --git a/patches/server/0035-Leaves-Syncmatica-Protocol.patch b/patches/server/0034-Leaves-Syncmatica-Protocol.patch
similarity index 99%
rename from patches/server/0035-Leaves-Syncmatica-Protocol.patch
rename to patches/server/0034-Leaves-Syncmatica-Protocol.patch
index 2c7a9625..d78e2549 100644
--- a/patches/server/0035-Leaves-Syncmatica-Protocol.patch
+++ b/patches/server/0034-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/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0af9de55adff7ccda286b3cbf7ac400b71661f72..87c96fa812aab05caa75c3c9d5eb3243e2ef9f55 100644
+index a21b0d93dd7699bb14eb82a09cf001b28c98e7ac..ea817cac41582cf6fd779253c855e8ab6f1ef511 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -319,6 +319,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0036-Chat-Image-protocol.patch b/patches/server/0035-Chat-Image-protocol.patch
similarity index 100%
rename from patches/server/0036-Chat-Image-protocol.patch
rename to patches/server/0035-Chat-Image-protocol.patch
diff --git a/patches/server/0037-Asteor-Bar-protocol.patch b/patches/server/0036-Asteor-Bar-protocol.patch
similarity index 100%
rename from patches/server/0037-Asteor-Bar-protocol.patch
rename to patches/server/0036-Asteor-Bar-protocol.patch
diff --git a/patches/server/0038-Leaves-Disable-moved-wrongly-threshold.patch b/patches/server/0037-Leaves-Disable-moved-wrongly-threshold.patch
similarity index 98%
rename from patches/server/0038-Leaves-Disable-moved-wrongly-threshold.patch
rename to patches/server/0037-Leaves-Disable-moved-wrongly-threshold.patch
index 7bbb1946..65bbf4ed 100644
--- a/patches/server/0038-Leaves-Disable-moved-wrongly-threshold.patch
+++ b/patches/server/0037-Leaves-Disable-moved-wrongly-threshold.patch
@@ -7,7 +7,7 @@ Original license: GPLv3
 Original project: https://github.com/LeavesMC/Leaves
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6927ee8c6654d605ec4c7961e5ba7ee518280c4d..0dc07ae0ba843b14fe970b6b0883f315193917fd 100644
+index ea817cac41582cf6fd779253c855e8ab6f1ef511..33b2234970e3b78ccd4b8da184bbdd62b50d3afa 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -593,7 +593,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0039-Faster-Random-for-xaeroMapServerID-generation.patch b/patches/server/0038-Faster-Random-for-xaeroMapServerID-generation.patch
similarity index 100%
rename from patches/server/0039-Faster-Random-for-xaeroMapServerID-generation.patch
rename to patches/server/0038-Faster-Random-for-xaeroMapServerID-generation.patch
diff --git a/patches/server/0040-Petal-Async-Pathfinding.patch b/patches/server/0039-Petal-Async-Pathfinding.patch
similarity index 100%
rename from patches/server/0040-Petal-Async-Pathfinding.patch
rename to patches/server/0039-Petal-Async-Pathfinding.patch
diff --git a/patches/server/0041-Petal-reduce-work-done-by-game-event-system.patch b/patches/server/0040-Petal-reduce-work-done-by-game-event-system.patch
similarity index 100%
rename from patches/server/0041-Petal-reduce-work-done-by-game-event-system.patch
rename to patches/server/0040-Petal-reduce-work-done-by-game-event-system.patch
diff --git a/patches/server/0042-Optimize-Minecart-collisions.patch b/patches/server/0041-Optimize-Minecart-collisions.patch
similarity index 100%
rename from patches/server/0042-Optimize-Minecart-collisions.patch
rename to patches/server/0041-Optimize-Minecart-collisions.patch
diff --git a/patches/server/0043-Reduce-canSee-work.patch b/patches/server/0042-Reduce-canSee-work.patch
similarity index 96%
rename from patches/server/0043-Reduce-canSee-work.patch
rename to patches/server/0042-Reduce-canSee-work.patch
index a98b8e16..f6353ec9 100644
--- a/patches/server/0043-Reduce-canSee-work.patch
+++ b/patches/server/0042-Reduce-canSee-work.patch
@@ -36,7 +36,7 @@ index 24ed26286c7e3e45279b6b27cd0a432b37fda4b2..83fcdd4d090bfc8801a640b2a5645313
              if (net.minecraft.world.phys.shapes.Shapes.joinIsNotEmpty(voxelshape, net.minecraft.world.phys.shapes.Shapes.create(entity.getBoundingBox()), net.minecraft.world.phys.shapes.BooleanOp.AND)) {
                  return false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a5f00869d4636867ce54ddbe18ccabfecaad4d9a..89b2b89fdb93f2b734169524175d3dc42bd7dea3 100644
+index 04aa0c7d2946a38427951217f2b865b005011ef5..1893d10e6900e006e9e62a2a5f8d9be26a60f03b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -638,6 +638,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0044-Faster-Natural-Spawning.patch b/patches/server/0043-Faster-Natural-Spawning.patch
similarity index 100%
rename from patches/server/0044-Faster-Natural-Spawning.patch
rename to patches/server/0043-Faster-Natural-Spawning.patch
diff --git a/patches/server/0045-Fix-sprint-glitch.patch b/patches/server/0044-Fix-sprint-glitch.patch
similarity index 90%
rename from patches/server/0045-Fix-sprint-glitch.patch
rename to patches/server/0044-Fix-sprint-glitch.patch
index c5e93a5e..74d39623 100644
--- a/patches/server/0045-Fix-sprint-glitch.patch
+++ b/patches/server/0044-Fix-sprint-glitch.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix sprint glitch
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 41a2254c5665b1a1ef770fe9f08271136cec2983..7c75298c8ea7a828c2d9cd4e7ffd4d09a0113aed 100644
+index 27e7086b4e2c71b29aa4a1c825604395a5f35439..69bd415f00f5b604b6de7b55bc2fcbbac6b69ee5 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1429,7 +1429,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0046-Configurable-movement-speed-of-more-entities.patch b/patches/server/0045-Configurable-movement-speed-of-more-entities.patch
similarity index 100%
rename from patches/server/0046-Configurable-movement-speed-of-more-entities.patch
rename to patches/server/0045-Configurable-movement-speed-of-more-entities.patch
diff --git a/patches/server/0047-Faster-sequencing-of-futures-for-chunk-structure-gen.patch b/patches/server/0046-Faster-sequencing-of-futures-for-chunk-structure-gen.patch
similarity index 100%
rename from patches/server/0047-Faster-sequencing-of-futures-for-chunk-structure-gen.patch
rename to patches/server/0046-Faster-sequencing-of-futures-for-chunk-structure-gen.patch
diff --git a/patches/server/0048-Reduce-items-finding-hopper-nearby-check.patch b/patches/server/0047-Reduce-items-finding-hopper-nearby-check.patch
similarity index 96%
rename from patches/server/0048-Reduce-items-finding-hopper-nearby-check.patch
rename to patches/server/0047-Reduce-items-finding-hopper-nearby-check.patch
index 5acf6d44..e994c396 100644
--- a/patches/server/0048-Reduce-items-finding-hopper-nearby-check.patch
+++ b/patches/server/0047-Reduce-items-finding-hopper-nearby-check.patch
@@ -9,7 +9,7 @@ But still recommend to turn-off `checkForMinecartNearItemWhileActive`
 Since `Reduce-hopper-item-checks.patch` will cause lag under massive dropped items
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 7db0a4b53f27622ad2fd85a451613fc83ea87052..3a27ef6da3d189f4f2211c9929dc1334790ab281 100644
+index 1ffd3e8e4d637d4a9f83320b8232d28f482ce281..fd96a97d35fcd422c3f99aa379a0daf9e5c2a695 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -245,7 +245,9 @@ public class ItemEntity extends Entity implements TraceableEntity {
diff --git a/patches/server/0049-Linear-region-file-format.patch b/patches/server/0048-Linear-region-file-format.patch
similarity index 100%
rename from patches/server/0049-Linear-region-file-format.patch
rename to patches/server/0048-Linear-region-file-format.patch
diff --git a/patches/server/0050-Plazma-Add-some-missing-Pufferfish-configurations.patch b/patches/server/0049-Plazma-Add-some-missing-Pufferfish-configurations.patch
similarity index 100%
rename from patches/server/0050-Plazma-Add-some-missing-Pufferfish-configurations.patch
rename to patches/server/0049-Plazma-Add-some-missing-Pufferfish-configurations.patch
diff --git a/patches/server/0051-Plazma-Add-missing-purpur-configuration-options.patch b/patches/server/0050-Plazma-Add-missing-purpur-configuration-options.patch
similarity index 100%
rename from patches/server/0051-Plazma-Add-missing-purpur-configuration-options.patch
rename to patches/server/0050-Plazma-Add-missing-purpur-configuration-options.patch
diff --git a/patches/server/0052-Skip-event-if-no-listeners.patch b/patches/server/0051-Skip-event-if-no-listeners.patch
similarity index 67%
rename from patches/server/0052-Skip-event-if-no-listeners.patch
rename to patches/server/0051-Skip-event-if-no-listeners.patch
index 0de65e64..920a2f30 100644
--- a/patches/server/0052-Skip-event-if-no-listeners.patch
+++ b/patches/server/0051-Skip-event-if-no-listeners.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Skip event if no listeners
 
 
 diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
-index 06dfd0b27ac0006a2be07f54a0702519a691c6ec..6994db535d8d39a73ce54da5b7a03b579323f4a8 100644
+index a1c9726d25479b5326fe2fa2b0f5a98d6b2da4c5..31bb5c3058233c98cbdd919e4803dd2f2266d39d 100644
 --- a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
 +++ b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
-@@ -35,6 +35,10 @@ class PaperEventManager {
+@@ -35,15 +35,16 @@ class PaperEventManager {
  
      // SimplePluginManager
      public void callEvent(@NotNull Event event) {
@@ -16,11 +16,10 @@ index 06dfd0b27ac0006a2be07f54a0702519a691c6ec..6994db535d8d39a73ce54da5b7a03b57
 +        RegisteredListener[] listeners = event.getHandlers().getRegisteredListeners();
 +        if (listeners.length == 0) return;
 +        // Leaf end - Skip event if no listeners
-         // KTP start - Optimise spigot event bus
-         if (event.asynchronous() != net.kyori.adventure.util.TriState.NOT_SET) {
-         final boolean onPrimaryThread = this.server.isPrimaryThread();
-@@ -47,9 +51,6 @@ class PaperEventManager {
-         // KTP stop - Optimise spigot event bus
+         if (event.isAsynchronous() && this.server.isPrimaryThread()) {
+             throw new IllegalStateException(event.getEventName() + " may only be triggered asynchronously.");
+         } else if (!event.isAsynchronous() && !this.server.isPrimaryThread() && !this.server.isStopping()) {
+             throw new IllegalStateException(event.getEventName() + " may only be triggered synchronously.");
          }
  
 -        HandlerList handlers = event.getHandlers();
diff --git a/patches/server/0053-PaperPR-Rewrite-framed-map-tracker-ticking.patch b/patches/server/0052-PaperPR-Rewrite-framed-map-tracker-ticking.patch
similarity index 100%
rename from patches/server/0053-PaperPR-Rewrite-framed-map-tracker-ticking.patch
rename to patches/server/0052-PaperPR-Rewrite-framed-map-tracker-ticking.patch
diff --git a/patches/server/0054-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/patches/server/0053-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch
similarity index 100%
rename from patches/server/0054-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch
rename to patches/server/0053-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch
diff --git a/patches/server/0055-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch b/patches/server/0054-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch
similarity index 100%
rename from patches/server/0055-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch
rename to patches/server/0054-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch
diff --git a/patches/server/0056-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch b/patches/server/0055-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch
similarity index 100%
rename from patches/server/0056-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch
rename to patches/server/0055-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch
diff --git a/patches/server/0057-SparklyPaper-Optimize-canSee-checks.patch b/patches/server/0056-SparklyPaper-Optimize-canSee-checks.patch
similarity index 97%
rename from patches/server/0057-SparklyPaper-Optimize-canSee-checks.patch
rename to patches/server/0056-SparklyPaper-Optimize-canSee-checks.patch
index 4ac3daa3..11aadf2b 100644
--- a/patches/server/0057-SparklyPaper-Optimize-canSee-checks.patch
+++ b/patches/server/0056-SparklyPaper-Optimize-canSee-checks.patch
@@ -29,7 +29,7 @@ index 41ab27bdeb3cbc54f71977feda61a3034eed3e9e..200a08d09904c6d5ea85b9e2c0228e61
                  }
                  // CraftBukkit end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 89b2b89fdb93f2b734169524175d3dc42bd7dea3..22a7e4392a598cf6fd3aa2900ecfa9e2f6117ec5 100644
+index 1893d10e6900e006e9e62a2a5f8d9be26a60f03b..d8845be63adbc17764a57c0630aa63b69b473753 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -200,7 +200,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0058-Polpot-Make-egg-and-snowball-can-knockback-player.patch b/patches/server/0057-Polpot-Make-egg-and-snowball-can-knockback-player.patch
similarity index 100%
rename from patches/server/0058-Polpot-Make-egg-and-snowball-can-knockback-player.patch
rename to patches/server/0057-Polpot-Make-egg-and-snowball-can-knockback-player.patch
diff --git a/patches/server/0059-Redirect-vanilla-getProfiler-in-PathNavigationRegion.patch b/patches/server/0058-Redirect-vanilla-getProfiler-in-PathNavigationRegion.patch
similarity index 100%
rename from patches/server/0059-Redirect-vanilla-getProfiler-in-PathNavigationRegion.patch
rename to patches/server/0058-Redirect-vanilla-getProfiler-in-PathNavigationRegion.patch
diff --git a/patches/server/0060-Fix-MC-65198.patch b/patches/server/0059-Fix-MC-65198.patch
similarity index 97%
rename from patches/server/0060-Fix-MC-65198.patch
rename to patches/server/0059-Fix-MC-65198.patch
index 6f7733dd..ea4c7002 100644
--- a/patches/server/0060-Fix-MC-65198.patch
+++ b/patches/server/0059-Fix-MC-65198.patch
@@ -40,7 +40,7 @@ index 37a89bf79017eb65f82276b054a70ddb5eb5e549..05d0c97966f35a6e8576c975d33990f4
  
          if (this.container instanceof RecipeCraftingHolder recipeCraftingHolder) {
 diff --git a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
-index 5ddae1afab0a68465ea60395c84b0997ee994f88..a67da91bbbe6fdfe44c40b13b426e2452dccd71e 100644
+index 5a0015f761f6a25d7bb7b9cfe7a9b4771a6a37ec..bd056f001e5efc34ad5c8cedc9e891514cfe5853 100644
 --- a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
 @@ -264,6 +264,7 @@ public class StonecutterMenu extends AbstractContainerMenu {
diff --git a/patches/server/0061-Including-5s-in-getTPS.patch b/patches/server/0060-Including-5s-in-getTPS.patch
similarity index 94%
rename from patches/server/0061-Including-5s-in-getTPS.patch
rename to patches/server/0060-Including-5s-in-getTPS.patch
index cdfb6b8d..a7e1b3e1 100644
--- a/patches/server/0061-Including-5s-in-getTPS.patch
+++ b/patches/server/0060-Including-5s-in-getTPS.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Including 5s in getTPS()
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d8559e5b4bb1e3781a394277f5c242a2ea7ca16c..85e78570ca4ac27e7bcb4ce876b8d90eb586a75b 100644
+index 07fcea774aa13d5d5dc9b5db7f515d5bf05df1ce..1b21006467a25f8ed20c8ded3deb9fe6513dc903 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -3113,6 +3113,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0062-Remove-useless-creating-stats-json-bases-on-player-n.patch b/patches/server/0061-Remove-useless-creating-stats-json-bases-on-player-n.patch
similarity index 100%
rename from patches/server/0062-Remove-useless-creating-stats-json-bases-on-player-n.patch
rename to patches/server/0061-Remove-useless-creating-stats-json-bases-on-player-n.patch
diff --git a/patches/server/0063-Fix-NPE-during-creating-GUI-graph.patch b/patches/server/0062-Fix-NPE-during-creating-GUI-graph.patch
similarity index 100%
rename from patches/server/0063-Fix-NPE-during-creating-GUI-graph.patch
rename to patches/server/0062-Fix-NPE-during-creating-GUI-graph.patch
diff --git a/patches/server/0064-Don-t-throw-exception-on-missing-ResourceKey-value.patch b/patches/server/0063-Don-t-throw-exception-on-missing-ResourceKey-value.patch
similarity index 100%
rename from patches/server/0064-Don-t-throw-exception-on-missing-ResourceKey-value.patch
rename to patches/server/0063-Don-t-throw-exception-on-missing-ResourceKey-value.patch
diff --git a/patches/server/0065-Improve-Purpur-AFK-system.patch b/patches/server/0064-Improve-Purpur-AFK-system.patch
similarity index 100%
rename from patches/server/0065-Improve-Purpur-AFK-system.patch
rename to patches/server/0064-Improve-Purpur-AFK-system.patch
diff --git a/patches/server/0066-Virtual-Thread-for-async-scheduler.patch b/patches/server/0065-Virtual-Thread-for-async-scheduler.patch
similarity index 100%
rename from patches/server/0066-Virtual-Thread-for-async-scheduler.patch
rename to patches/server/0065-Virtual-Thread-for-async-scheduler.patch
diff --git a/patches/server/0067-Mirai-Configurable-chat-message-signatures.patch b/patches/server/0066-Mirai-Configurable-chat-message-signatures.patch
similarity index 100%
rename from patches/server/0067-Mirai-Configurable-chat-message-signatures.patch
rename to patches/server/0066-Mirai-Configurable-chat-message-signatures.patch
diff --git a/patches/server/0068-Cache-player-profileResult.patch b/patches/server/0067-Cache-player-profileResult.patch
similarity index 98%
rename from patches/server/0068-Cache-player-profileResult.patch
rename to patches/server/0067-Cache-player-profileResult.patch
index 6ed60be0..bae3eb3c 100644
--- a/patches/server/0068-Cache-player-profileResult.patch
+++ b/patches/server/0067-Cache-player-profileResult.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cache player profileResult
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 57b524c602751e6b8be9052b15a7cee6e1447e7e..6e1c71f4073dc4b43787a3f6599453d9db7bf8bb 100644
+index af9ebf010b7c88671e8f9870e976cff278e97611..cb46050cffc63e64c090d83451243ab2afcecf7d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -26,6 +26,10 @@ dependencies {
diff --git a/patches/server/0069-Prevent-change-non-editable-sign-warning-spam-in-con.patch b/patches/server/0068-Prevent-change-non-editable-sign-warning-spam-in-con.patch
similarity index 96%
rename from patches/server/0069-Prevent-change-non-editable-sign-warning-spam-in-con.patch
rename to patches/server/0068-Prevent-change-non-editable-sign-warning-spam-in-con.patch
index 008c7a5a..2a6a960c 100644
--- a/patches/server/0069-Prevent-change-non-editable-sign-warning-spam-in-con.patch
+++ b/patches/server/0068-Prevent-change-non-editable-sign-warning-spam-in-con.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent change non-editable sign warning spam in console
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-index 8cd812a25b1cc05ea14675658bf9c1503ebebd51..94f09eaba8d8fffb18b1f1407baf982763a18f5e 100644
+index c9a1c071780351b584ad8e071ddc26f9a27e5964..b17defc83411c3528cae1930136e771c5023f399 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 @@ -189,7 +189,7 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
diff --git a/patches/server/0070-Matter-Secure-Seed.patch b/patches/server/0069-Matter-Secure-Seed.patch
similarity index 99%
rename from patches/server/0070-Matter-Secure-Seed.patch
rename to patches/server/0069-Matter-Secure-Seed.patch
index d4e5b9f7..a94a729e 100644
--- a/patches/server/0070-Matter-Secure-Seed.patch
+++ b/patches/server/0069-Matter-Secure-Seed.patch
@@ -46,7 +46,7 @@ index 74bf36f75b59b1e21b72afcf653447864d7c3f80..ef2d70c1bd21cff6a080205c38bbe8bf
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0d4a36e59072de962363bb72babae30f792bf560..946339933b361f5a85df74d6c212acffe2e08f5e 100644
+index 20f1069230fcef4a00deec4c0ae6fdc64041630a..dab20d348d7542a985a2510b37029ff97e8be1f6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -558,6 +558,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -450,7 +450,7 @@ index 45e262308aebafa377a2353661acdd122933b99e..96b9e91997bba777ebe868ca5ab5e5e9
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e391461802132d40ab65d4d339b0e438a49b2948..6c1794a9cf1b90db70d3ec049b4ba81bbf0a0a24 100644
+index 1b21006467a25f8ed20c8ded3deb9fe6513dc903..89672b8f729e0286157a0db2277529dc663d7fc8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1400,7 +1400,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0071-Matter-Seed-Command.patch b/patches/server/0070-Matter-Seed-Command.patch
similarity index 100%
rename from patches/server/0071-Matter-Seed-Command.patch
rename to patches/server/0070-Matter-Seed-Command.patch
diff --git a/patches/server/0072-Ignore-terminal-provider-warning.patch b/patches/server/0071-Ignore-terminal-provider-warning.patch
similarity index 100%
rename from patches/server/0072-Ignore-terminal-provider-warning.patch
rename to patches/server/0071-Ignore-terminal-provider-warning.patch
diff --git a/patches/server/0073-Fix-console-freeze-above-JAVA-22.patch b/patches/server/0072-Fix-console-freeze-above-JAVA-22.patch
similarity index 100%
rename from patches/server/0073-Fix-console-freeze-above-JAVA-22.patch
rename to patches/server/0072-Fix-console-freeze-above-JAVA-22.patch
diff --git a/patches/server/0074-Fix-console-output-display-on-Pterodactyl-panel.patch b/patches/server/0073-Fix-console-output-display-on-Pterodactyl-panel.patch
similarity index 100%
rename from patches/server/0074-Fix-console-output-display-on-Pterodactyl-panel.patch
rename to patches/server/0073-Fix-console-output-display-on-Pterodactyl-panel.patch
diff --git a/patches/server/0075-Faster-Random-Generator.patch b/patches/server/0074-Faster-Random-Generator.patch
similarity index 100%
rename from patches/server/0075-Faster-Random-Generator.patch
rename to patches/server/0074-Faster-Random-Generator.patch
diff --git a/patches/server/0076-Don-t-save-primed-tnt-entity.patch b/patches/server/0075-Don-t-save-primed-tnt-entity.patch
similarity index 100%
rename from patches/server/0076-Don-t-save-primed-tnt-entity.patch
rename to patches/server/0075-Don-t-save-primed-tnt-entity.patch
diff --git a/patches/server/0077-Don-t-save-falling-block-entity.patch b/patches/server/0076-Don-t-save-falling-block-entity.patch
similarity index 100%
rename from patches/server/0077-Don-t-save-falling-block-entity.patch
rename to patches/server/0076-Don-t-save-falling-block-entity.patch
diff --git a/patches/server/0078-Configurable-connection-message.patch b/patches/server/0077-Configurable-connection-message.patch
similarity index 100%
rename from patches/server/0078-Configurable-connection-message.patch
rename to patches/server/0077-Configurable-connection-message.patch
diff --git a/patches/server/0079-Configurable-unknown-command-message.patch b/patches/server/0078-Configurable-unknown-command-message.patch
similarity index 100%
rename from patches/server/0079-Configurable-unknown-command-message.patch
rename to patches/server/0078-Configurable-unknown-command-message.patch
diff --git a/patches/server/0080-Airplane-Remove-stream-in-PoiCompetitorScan.patch b/patches/server/0079-Airplane-Remove-stream-in-PoiCompetitorScan.patch
similarity index 100%
rename from patches/server/0080-Airplane-Remove-stream-in-PoiCompetitorScan.patch
rename to patches/server/0079-Airplane-Remove-stream-in-PoiCompetitorScan.patch
diff --git a/patches/server/0081-Remove-stream-in-BlockBehaviour-cache-blockstate.patch b/patches/server/0080-Remove-stream-in-BlockBehaviour-cache-blockstate.patch
similarity index 100%
rename from patches/server/0081-Remove-stream-in-BlockBehaviour-cache-blockstate.patch
rename to patches/server/0080-Remove-stream-in-BlockBehaviour-cache-blockstate.patch
diff --git a/patches/server/0082-Remove-stream-in-RecipeManager-getRecipeFor.patch b/patches/server/0081-Remove-stream-in-RecipeManager-getRecipeFor.patch
similarity index 100%
rename from patches/server/0082-Remove-stream-in-RecipeManager-getRecipeFor.patch
rename to patches/server/0081-Remove-stream-in-RecipeManager-getRecipeFor.patch
diff --git a/patches/server/0083-Reduce-worldgen-allocations.patch b/patches/server/0082-Reduce-worldgen-allocations.patch
similarity index 100%
rename from patches/server/0083-Reduce-worldgen-allocations.patch
rename to patches/server/0082-Reduce-worldgen-allocations.patch
diff --git a/patches/server/0084-Fix-MC-183518.patch b/patches/server/0083-Fix-MC-183518.patch
similarity index 100%
rename from patches/server/0084-Fix-MC-183518.patch
rename to patches/server/0083-Fix-MC-183518.patch
diff --git a/patches/server/0085-Use-caffeine-cache-kickPermission-instead-of-using-g.patch b/patches/server/0084-Use-caffeine-cache-kickPermission-instead-of-using-g.patch
similarity index 96%
rename from patches/server/0085-Use-caffeine-cache-kickPermission-instead-of-using-g.patch
rename to patches/server/0084-Use-caffeine-cache-kickPermission-instead-of-using-g.patch
index fd2863b6..c594cc16 100644
--- a/patches/server/0085-Use-caffeine-cache-kickPermission-instead-of-using-g.patch
+++ b/patches/server/0084-Use-caffeine-cache-kickPermission-instead-of-using-g.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use caffeine cache kickPermission instead of using
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3f123bbed6522c30d0319c465fce6830d7c274d1..906c4e90997fbcdaf7af2a5077a7a50e25d7107f 100644
+index 81b0f8c986131335533f6c81f9150b8c6019f8d7..68cc3c4efd7e10a2ddc0576491e9cb5b02fcabe7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -339,17 +339,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0086-Do-not-place-player-if-the-server-is-full.patch b/patches/server/0085-Do-not-place-player-if-the-server-is-full.patch
similarity index 100%
rename from patches/server/0086-Do-not-place-player-if-the-server-is-full.patch
rename to patches/server/0085-Do-not-place-player-if-the-server-is-full.patch
diff --git a/patches/server/0087-Fix-MC-200418.patch b/patches/server/0086-Fix-MC-200418.patch
similarity index 100%
rename from patches/server/0087-Fix-MC-200418.patch
rename to patches/server/0086-Fix-MC-200418.patch
diff --git a/patches/server/0088-Fix-MC-119417.patch b/patches/server/0087-Fix-MC-119417.patch
similarity index 100%
rename from patches/server/0088-Fix-MC-119417.patch
rename to patches/server/0087-Fix-MC-119417.patch
diff --git a/patches/server/0089-Fix-MC-223153.patch b/patches/server/0088-Fix-MC-223153.patch
similarity index 100%
rename from patches/server/0089-Fix-MC-223153.patch
rename to patches/server/0088-Fix-MC-223153.patch
diff --git a/patches/server/0090-Optimize-LeavesProtocolManager-init-protocol.patch b/patches/server/0089-Optimize-LeavesProtocolManager-init-protocol.patch
similarity index 100%
rename from patches/server/0090-Optimize-LeavesProtocolManager-init-protocol.patch
rename to patches/server/0089-Optimize-LeavesProtocolManager-init-protocol.patch
diff --git a/patches/server/0091-Optimize-check-nearby-fire-or-lava-on-entity-move.patch b/patches/server/0090-Optimize-check-nearby-fire-or-lava-on-entity-move.patch
similarity index 98%
rename from patches/server/0091-Optimize-check-nearby-fire-or-lava-on-entity-move.patch
rename to patches/server/0090-Optimize-check-nearby-fire-or-lava-on-entity-move.patch
index 81570e1c..d859542b 100644
--- a/patches/server/0091-Optimize-check-nearby-fire-or-lava-on-entity-move.patch
+++ b/patches/server/0090-Optimize-check-nearby-fire-or-lava-on-entity-move.patch
@@ -7,7 +7,7 @@ Remove stream and remove double Mth.floor() convert
 before 1700ms, after 370ms, in massive stacked minecart test
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 164c126a61f550c09a7e114bf8947bde1c5a3aa8..e8332ab62a6759563bbfd76b8f8a7193297a3d31 100644
+index 37b16b4e44f2a807f5524d1ba33b90ca8ce862e1..cfc30119641169fe47aa0eeb6f272c1b7310a187 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1337,9 +1337,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0092-Cache-CraftEntityType-minecraftToBukkit-convert.patch b/patches/server/0091-Cache-CraftEntityType-minecraftToBukkit-convert.patch
similarity index 100%
rename from patches/server/0092-Cache-CraftEntityType-minecraftToBukkit-convert.patch
rename to patches/server/0091-Cache-CraftEntityType-minecraftToBukkit-convert.patch
diff --git a/patches/server/0093-Configurable-player-knockback-zombie.patch b/patches/server/0092-Configurable-player-knockback-zombie.patch
similarity index 100%
rename from patches/server/0093-Configurable-player-knockback-zombie.patch
rename to patches/server/0092-Configurable-player-knockback-zombie.patch
diff --git a/patches/server/0094-Hide-specified-item-components-to-clients.patch b/patches/server/0093-Hide-specified-item-components-to-clients.patch
similarity index 100%
rename from patches/server/0094-Hide-specified-item-components-to-clients.patch
rename to patches/server/0093-Hide-specified-item-components-to-clients.patch
diff --git a/patches/server/0095-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch b/patches/server/0094-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch
similarity index 97%
rename from patches/server/0095-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch
rename to patches/server/0094-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch
index a10f159a..5c061cbb 100644
--- a/patches/server/0095-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch
+++ b/patches/server/0094-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch
@@ -8,7 +8,7 @@ Original project: https://github.com/PaperMC/Paper
 Paper pull request: https://github.com/PaperMC/Paper/pull/10990
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 96a165dc8a0ec8cb0e7828d2169b2efc51c638c7..41e1df6e4d7e859285ce482df841b0ac07338272 100644
+index 02d7180e5b932dd8c7e8867f1334cbc47e26f5bd..9d196c8a8a0dc49a54264471429b6ff6da8c2b06 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -239,6 +239,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
diff --git a/patches/server/0096-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch b/patches/server/0095-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch
similarity index 100%
rename from patches/server/0096-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch
rename to patches/server/0095-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch
diff --git a/patches/server/0097-Paper-PR-Throttle-failed-spawn-attempts.patch b/patches/server/0096-Paper-PR-Throttle-failed-spawn-attempts.patch
similarity index 98%
rename from patches/server/0097-Paper-PR-Throttle-failed-spawn-attempts.patch
rename to patches/server/0096-Paper-PR-Throttle-failed-spawn-attempts.patch
index 2e78dc00..69eadbf2 100644
--- a/patches/server/0097-Paper-PR-Throttle-failed-spawn-attempts.patch
+++ b/patches/server/0096-Paper-PR-Throttle-failed-spawn-attempts.patch
@@ -31,7 +31,7 @@ vain. Throttling spawn attempts in suspected spawnproof chunks improves
 performance without noticeably advantaging or disadvantaging the mob farm.
 
 diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-index aa3624fb8aaaf2720aaef7800f537dd4b906797f..1b8fb4856fa53886e5028a666d3651d1f281d4d4 100644
+index f1b74f7b12fc7b35815886501937725b65f8a8e3..4c32d5b9db0579e597039121a329057f4b760089 100644
 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
 @@ -190,6 +190,15 @@ public class WorldConfiguration extends ConfigurationPart {
diff --git a/patches/server/0098-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch b/patches/server/0097-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch
similarity index 100%
rename from patches/server/0098-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch
rename to patches/server/0097-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch
diff --git a/patches/server/0099-Dont-send-useless-entity-packets.patch b/patches/server/0098-Dont-send-useless-entity-packets.patch
similarity index 100%
rename from patches/server/0099-Dont-send-useless-entity-packets.patch
rename to patches/server/0098-Dont-send-useless-entity-packets.patch
diff --git a/patches/server/0100-Don-t-spawn-if-lastSpawnState-is-null.patch b/patches/server/0099-Don-t-spawn-if-lastSpawnState-is-null.patch
similarity index 100%
rename from patches/server/0100-Don-t-spawn-if-lastSpawnState-is-null.patch
rename to patches/server/0099-Don-t-spawn-if-lastSpawnState-is-null.patch