diff --git a/gradle.properties b/gradle.properties
index 14dbf9e3d..56cc7ef66 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@ version = 1.21.11-R0.1-SNAPSHOT
 
 mcVersion = 1.21.11
 apiVersion = 1.21.11
-paperCommit = 7e80cef5198561d0db53406127e5b8bc7af51577
+paperCommit = 3f5728e24942a470a428c60839eda5340f85f9f8
 
 org.gradle.configuration-cache = true
 org.gradle.caching = true
diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Villager.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Villager.java.patch
index 446119a47..6fc3b4a03 100644
--- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Villager.java.patch
+++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Villager.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/entity/Villager.java
 +++ b/src/main/java/org/bukkit/entity/Villager.java
-@@ -406,4 +_,13 @@
+@@ -409,4 +_,13 @@
       * Demand is still updated even if all events are canceled.
       */
      public void restock();
diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Wolf.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Wolf.java.patch
index 201466d6b..75efe3b44 100644
--- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Wolf.java.patch
+++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Wolf.java.patch
@@ -1,7 +1,7 @@
 --- a/src/main/java/org/bukkit/entity/Wolf.java
 +++ b/src/main/java/org/bukkit/entity/Wolf.java
-@@ -162,4 +_,20 @@
-             return RegistryAccess.registryAccess().getRegistry(RegistryKey.WOLF_SOUND_VARIANT).getOrThrow(NamespacedKey.minecraft(key));
+@@ -163,4 +_,20 @@
+             return RegistryAccess.registryAccess().getRegistry(RegistryKey.WOLF_SOUND_VARIANT).getOrThrow(Key.key(Key.MINECRAFT_NAMESPACE, key));
          }
      }
 +
diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/Main.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/Main.java.patch
index 90b5a610d..49802a905 100644
--- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/Main.java.patch
+++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/Main.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -169,6 +_,14 @@
+@@ -139,6 +_,14 @@
                          .defaultsTo(new File[] {})
                          .describedAs("Plugin directory");
  
diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch
index 8d4551161..dde31a20a 100644
--- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch
+++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -487,7 +_,7 @@
+@@ -485,7 +_,7 @@
  
      @Override
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {