diff --git a/paper-server/patches/features/0017-Optimize-Hoppers.patch b/feature-patches/2017-Optimize-Hoppers.patch
similarity index 100%
rename from paper-server/patches/features/0017-Optimize-Hoppers.patch
rename to feature-patches/2017-Optimize-Hoppers.patch
diff --git a/paper-server/patches/features/0018-Optimize-Bit-Operations-by-inlining.patch b/paper-server/patches/features/0017-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from paper-server/patches/features/0018-Optimize-Bit-Operations-by-inlining.patch
rename to paper-server/patches/features/0017-Optimize-Bit-Operations-by-inlining.patch
diff --git a/paper-server/patches/features/0019-Remove-streams-from-hot-code.patch b/paper-server/patches/features/0018-Remove-streams-from-hot-code.patch
similarity index 100%
rename from paper-server/patches/features/0019-Remove-streams-from-hot-code.patch
rename to paper-server/patches/features/0018-Remove-streams-from-hot-code.patch
diff --git a/paper-server/patches/features/0020-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/paper-server/patches/features/0019-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from paper-server/patches/features/0020-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to paper-server/patches/features/0019-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/paper-server/patches/features/0021-Rewrite-dataconverter-system.patch b/paper-server/patches/features/0020-Rewrite-dataconverter-system.patch
similarity index 99%
rename from paper-server/patches/features/0021-Rewrite-dataconverter-system.patch
rename to paper-server/patches/features/0020-Rewrite-dataconverter-system.patch
index 63941b2edb..844c0f9320 100644
--- a/paper-server/patches/features/0021-Rewrite-dataconverter-system.patch
+++ b/paper-server/patches/features/0020-Rewrite-dataconverter-system.patch
@@ -30621,7 +30621,7 @@ index 1110ca4075a1bbaa46b66686435dab91b275c945..c2218630c3074c8b3f82364e37503b12
          return structureTemplate.save(new CompoundTag());
      }
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 8657e4fd7c5e0e23b69d9a982408a7d038f0a787..415ab7faf371507e278d0da5bf0ffa9972585876 100644
+index d450d4af96716caff4b29a84d1d83ec4010854f0..646c2f2b617ed706021c83c9fc4492860dfdd4e9 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -301,6 +301,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa