diff --git a/gradle.properties b/gradle.properties
index 3d3b1c720..faae96724 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21.4-R0.1-SNAPSHOT
 
 mcVersion = 1.21.4
-paperCommit = 6ea42025a49f232f47861c6ca943b0fc66b7effe
+paperCommit = 894631f0d091a3de52aed4b6ec0c4f6c7584d697
 
 org.gradle.configuration-cache = true
 org.gradle.caching = true
diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/Bukkit.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/Bukkit.java.patch
index 795880bef..b36882456 100644
--- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/Bukkit.java.patch
+++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/Bukkit.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2995,4 +_,133 @@
+@@ -2996,4 +_,133 @@
      public static void restart() {
          server.restart();
      }
diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch
index b970083ba..aaf9c281d 100644
--- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch
+++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4278,6 +_,86 @@
+@@ -4277,6 +_,86 @@
      @Nullable
      public DragonBattle getEnderDragonBattle();
  
diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Endermite.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Endermite.java.patch
index 218b3659e..b2f7a4584 100644
--- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Endermite.java.patch
+++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Endermite.java.patch
@@ -13,7 +13,7 @@
       * @return player spawned status
 -     * @deprecated this functionality no longer exists
       */
--    @Deprecated(since = "1.17")
+-    @Deprecated(since = "1.17", forRemoval = true)
      boolean isPlayerSpawned();
  
      /**
@@ -26,7 +26,7 @@
       * @param playerSpawned player spawned status
 -     * @deprecated this functionality no longer exists
       */
--    @Deprecated(since = "1.17")
+-    @Deprecated(since = "1.17", forRemoval = true)
      void setPlayerSpawned(boolean playerSpawned);
      // Paper start
      /**
diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch
index 89a9146e7..6ea73f368 100644
--- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch
+++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch
@@ -106,7 +106,7 @@
      @Override
      public List<Recipe> getRecipesFor(ItemStack result) {
          Preconditions.checkArgument(result != null, "ItemStack cannot be null");
-@@ -3052,6 +_,18 @@
+@@ -3047,6 +_,18 @@
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
  
@@ -125,7 +125,7 @@
          @Override
          public void restart() {
              CraftServer.this.restart();
-@@ -3086,6 +_,7 @@
+@@ -3081,6 +_,7 @@
      @Override
      public double[] getTPS() {
          return new double[] {
@@ -133,7 +133,7 @@
              net.minecraft.server.MinecraftServer.getServer().tps1.getAverage(),
              net.minecraft.server.MinecraftServer.getServer().tps5.getAverage(),
              net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
-@@ -3296,4 +_,18 @@
+@@ -3291,4 +_,18 @@
          this.console.addPluginAllowingSleep(plugin.getName(), value);
      }
      // Paper end - API to check if the server is sleeping