diff --git a/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml b/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml
index cdd44578f..f285361d8 100644
--- a/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml
+++ b/.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Purpur Paperclip Jar" type="JarApplication">
-    <option name="JAR_PATH" value="$PROJECT_DIR$/purpur-server/build/libs/purpur-paperclip-1.21.5-R0.1-SNAPSHOT-mojmap.jar" />
+    <option name="JAR_PATH" value="$PROJECT_DIR$/purpur-server/build/libs/purpur-paperclip-1.21.6-R0.1-SNAPSHOT-mojmap.jar" />
     <option name="VM_PARAMETERS" value="-Dcom.mojang.eula.agree" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/run" />
     <option name="ALTERNATIVE_JRE_PATH" />
@@ -8,4 +8,4 @@
       <option name="RunConfigurationTask" enabled="false" run_configuration_name="Upstream Paper [createMojmapPaperclipJar]" run_configuration_type="GradleRunConfiguration" />
     </method>
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 6f8529412..564b95259 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21.6-R0.1-SNAPSHOT
 
 mcVersion = 1.21.6-pre3
-paperCommit = 94fefb88e6af6e7699d16d949dc4cee88e0c4a1b
+paperCommit = c5fc0dc84b2e9f875b7dc03ed75cf6744abc4902
 
 org.gradle.configuration-cache = true
 org.gradle.caching = true
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/commands/CommandSourceStack.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/commands/CommandSourceStack.java.patch
index 8863fb3c8..007fa82c9 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/commands/CommandSourceStack.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/commands/CommandSourceStack.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/commands/CommandSourceStack.java
 +++ b/net/minecraft/commands/CommandSourceStack.java
-@@ -457,6 +_,19 @@
+@@ -447,6 +_,19 @@
      }
      // CraftBukkit end
  
@@ -20,7 +20,7 @@
      public Vec3 getPosition() {
          return this.worldPosition;
      }
-@@ -541,6 +_,30 @@
+@@ -531,6 +_,30 @@
              }
          }
      }
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/commands/Commands.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/commands/Commands.java.patch
index 0fc215487..3e54cc7b4 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/commands/Commands.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/commands/Commands.java.patch
@@ -24,7 +24,7 @@
          }
  
          if (selection.includeIntegrated) {
-@@ -535,6 +_,7 @@
+@@ -537,6 +_,7 @@
      private void runSync(ServerPlayer player, java.util.Collection<String> bukkit, RootCommandNode<CommandSourceStack> rootCommandNode) {
          // Paper end - Perf: Async command map building
          new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootCommandNode, true).callEvent(); // Paper - Brigadier API
@@ -32,7 +32,7 @@
          org.bukkit.event.player.PlayerCommandSendEvent event = new org.bukkit.event.player.PlayerCommandSendEvent(player.getBukkitEntity(), new java.util.LinkedHashSet<>(bukkit));
          event.getPlayer().getServer().getPluginManager().callEvent(event);
  
-@@ -545,6 +_,8 @@
+@@ -547,6 +_,8 @@
              }
          }
          // CraftBukkit end
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch
index eddf86fda..dc002e072 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch
@@ -65,7 +65,7 @@
          this.generator = generator;
          this.world = new CraftWorld((ServerLevel) this, generator, biomeProvider, environment);
  
-@@ -2131,4 +_,14 @@
+@@ -2124,4 +_,14 @@
              return this.id;
          }
      }
diff --git a/purpur-server/paper-patches/features/0006-fix-tests.patch b/purpur-server/paper-patches/features/0006-fix-tests.patch
deleted file mode 100644
index 876fc5584..000000000
--- a/purpur-server/paper-patches/features/0006-fix-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: granny <contact@granny.dev>
-Date: Thu, 5 Jun 2025 20:05:32 -0700
-Subject: [PATCH] fix tests
-
-
-diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/YamlSerializationTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/YamlSerializationTest.java
-index 6ecfd6209dc2c994b43d29d328668435e16c69d1..f92ce0a220b347e54252ebaf3123d5abca807c22 100644
---- a/src/test/java/org/bukkit/craftbukkit/inventory/YamlSerializationTest.java
-+++ b/src/test/java/org/bukkit/craftbukkit/inventory/YamlSerializationTest.java
-@@ -94,8 +94,8 @@ public class YamlSerializationTest {
-               count: 1
-               components:
-                 minecraft:unbreakable: '{}'
-+                minecraft:tooltip_display: '{hidden_components:["minecraft:unbreakable","minecraft:enchantments"]}'
-                 minecraft:enchantments: '{"minecraft:sharpness":2}'
--                minecraft:tooltip_display: '{hidden_components:["minecraft:enchantments","minecraft:unbreakable"]}'
-               schema_version: 1
-             """.formatted(Bukkit.getUnsafe().getDataVersion()));
-     }