diff --git a/gradle.properties b/gradle.properties
index eead44233..4fb88073c 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 = a0f626b55215dfb4d3b1e9763901bdeee9184e48
+paperCommit = b5e7257841b4182a5a53fc7aeecff009301e0bfb
 
 org.gradle.configuration-cache = true
 org.gradle.caching = true
diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch
index 02f7f5abb..e95863592 100644
--- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch
+++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -3708,4 +_,40 @@
+@@ -3703,4 +_,40 @@
          return this.asItemType().getDefaultDataTypes();
      }
      // Paper end - data component API
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 201143cb7..1b474a6ac 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
@@ -28,7 +28,7 @@
 +        org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur - Purpur config files
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
-             world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && world.getGameRules().get(GameRules.SPAWN_MONSTERS)); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
+             world.setSpawnSettings(world.isSpawningMonsters()); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
 @@ -1007,6 +_,7 @@
                  }
              }