From 88d1824d222e4360ea63176dbd41d5249325eb9b Mon Sep 17 00:00:00 2001 From: granny Date: Sun, 18 Jan 2026 14:36:10 -0800 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@0bd2eca0 [ci/skip] Clarify AsyncPlayerPreLoginEvent is post authentication (#13519) PaperMC/Paper@e7445e16 Prevent ticking virtual world borders multiple times per server tick (#13513) PaperMC/Paper@c3b18bdf Fix tracking depth in Scope (#13538) PaperMC/Paper@fc1d2c42 Check spawn_mobs gamerule for spawnEnemies flag (#13510) PaperMC/Paper@3bf1cb81 Add LEGACY_BARRIER to isTransparent (#13515) PaperMC/Paper@290414e7 Fix legacy conversion for maxDurability / data (#13529) PaperMC/Paper@b5e72578 Remove hard-coded max stack sizes from Material (#13518) --- gradle.properties | 2 +- .../files/src/main/java/org/bukkit/Material.java.patch | 2 +- .../src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 @@ } }