From a91710642835466d3b07c1ab87bbdc8a75fd5a18 Mon Sep 17 00:00:00 2001 From: granny Date: Wed, 18 Feb 2026 03:56:56 +0000 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@d10c3129 Update inactive tick handler (#13621) PaperMC/Paper@6103cc7f Expand mobs-can-always-pick-up-loot.zombies for husk (#13624) PaperMC/Paper@255c25e2 fix "do not prematurely disconnect players on stop" (#13625) PaperMC/Paper@e17a767f Logging fixes around plugin disable and shutdown; logging cleanup (#13622) PaperMC/Paper@1f1406f1 Fix collision inconsistency with Vanilla PaperMC/Paper@6f71be80 Sync Moonrise --- gradle.properties | 2 +- .../minecraft-patches/features/0001-Ridables.patch | 8 ++++---- .../0020-Setting-to-reintroduce-end-void-rings.patch | 4 ++-- .../sources/net/minecraft/CrashReport.java.patch | 6 +++--- .../net/minecraft/server/MinecraftServer.java.patch | 10 +++++----- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3e1ebf85a..75eec5014 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 = 302c47c0dda6251fd5eb6bf7130345e9dcb988fc +paperCommit = 6f71be809ba856c3eb0991a569cd3d890a81ed86 org.gradle.configuration-cache = true org.gradle.caching = true diff --git a/purpur-server/minecraft-patches/features/0001-Ridables.patch b/purpur-server/minecraft-patches/features/0001-Ridables.patch index 1062e3de3..45fa56968 100644 --- a/purpur-server/minecraft-patches/features/0001-Ridables.patch +++ b/purpur-server/minecraft-patches/features/0001-Ridables.patch @@ -18,10 +18,10 @@ index 05eb0c3273ffa1b5a1ebd8f8ae42c11830d755c7..49d3154afe2ca5789e63bdf972c79196 public boolean isClientAuthoritative() { return false; diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 21ec2d87249824a6f796833baa48b122e39157d2..cbf0f526329b0de3281795667203a6500c6aedd0 100644 +index 7a54f6bc2a364c1d3ac1ed58b33ecf720a305840..9f3aec24bd8aa75ea116375c1cf0a54bcc229fa2 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -1836,6 +1836,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Paper - Add EntityMoveEvent serverLevel.updateLagCompensationTick(); // Paper - lag compensation net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = serverLevel.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - Perf: Optimize Hoppers @@ -4957,7 +4957,7 @@ index 604d5e6a4962de61fb97988a2f3de2965908bada..03c801d5982eed73fd8f56f63ccab570 } } diff --git a/net/minecraft/world/entity/monster/zombie/Husk.java b/net/minecraft/world/entity/monster/zombie/Husk.java -index f36d92f0f62354be5f4e39e768aabb1369cfe18c..f18ac33d31ae23db02654658840b89ba03736bf3 100644 +index 93fd34d12c1b9702ff7480f434648d70638bf1a9..ee66242db5ada8e5f8ab7ddc452c2fa818ebef89 100644 --- a/net/minecraft/world/entity/monster/zombie/Husk.java +++ b/net/minecraft/world/entity/monster/zombie/Husk.java @@ -29,6 +29,23 @@ public class Husk extends Zombie { @@ -4985,7 +4985,7 @@ index f36d92f0f62354be5f4e39e768aabb1369cfe18c..f18ac33d31ae23db02654658840b89ba public boolean isSunSensitive() { return false; diff --git a/net/minecraft/world/entity/monster/zombie/Zombie.java b/net/minecraft/world/entity/monster/zombie/Zombie.java -index d80c1cd0d254c941c9f0234a3187fc530116ec01..bbc4db926930abed4948aad0af464dc8c6fd01b1 100644 +index 34891f05809550256c07683c2d0c28d55c342758..15f2e24e8b8ef367a134d88e7c47a3377beceaea 100644 --- a/net/minecraft/world/entity/monster/zombie/Zombie.java +++ b/net/minecraft/world/entity/monster/zombie/Zombie.java @@ -103,11 +103,30 @@ public class Zombie extends Monster { diff --git a/purpur-server/minecraft-patches/features/0020-Setting-to-reintroduce-end-void-rings.patch b/purpur-server/minecraft-patches/features/0020-Setting-to-reintroduce-end-void-rings.patch index 01a35e2df..b332c33f3 100644 --- a/purpur-server/minecraft-patches/features/0020-Setting-to-reintroduce-end-void-rings.patch +++ b/purpur-server/minecraft-patches/features/0020-Setting-to-reintroduce-end-void-rings.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Setting to reintroduce end void rings diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 2717e0a1fd8a3cc7d4a6f8d18659293e86025cd0..d09d59cfa274c16e86c2d0a3d0339b7e72be3d13 100644 +index 9f3aec24bd8aa75ea116375c1cf0a54bcc229fa2..4af19f9f5152e9f6386e375a1ac5280ce00f48ea 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -1318,6 +1318,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop extraInfo = List.of("", "DO NOT REPORT THIS TO PAPER! REPORT TO PURPUR INSTEAD!", ""); // Purpur - Rebrand public CrashReport(String title, Throwable exception) { - io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(exception); // Paper -@@ -130,7 +_,7 @@ + this.title = title; +@@ -129,7 +_,7 @@ } public String getFriendlyReport(ReportType type) { @@ -17,7 +17,7 @@ } public @Nullable Path getSaveFile() { -@@ -160,7 +_,7 @@ +@@ -159,7 +_,7 @@ } public boolean saveToFile(Path path, ReportType type) { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch index 03986f19e..f37e7049e 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch @@ -41,7 +41,7 @@ // CraftBukkit start if (this.server != null) { this.server.spark.disable(); // Paper - spark -@@ -1112,6 +_,8 @@ +@@ -1107,6 +_,8 @@ this.safeShutdown(waitForShutdown, false); } public void safeShutdown(boolean waitForShutdown, boolean isRestarting) { @@ -50,7 +50,7 @@ this.isRestarting = isRestarting; this.hasLoggedStop = true; // Paper - Debugging if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper - Debugging -@@ -1289,11 +_,21 @@ +@@ -1284,11 +_,21 @@ } // Paper end - Add onboarding message for initial server start // Paper start - Improve outdated version checking @@ -73,7 +73,7 @@ while (this.running) { final long tickStart = System.nanoTime(); // Paper - improve tick loop long l; // Paper - improve tick loop - diff on change, expect this to be tick interval -@@ -1307,8 +_,10 @@ +@@ -1302,8 +_,10 @@ final long ticksBehind = Math.max(1L, this.tickSchedule.getPeriodsAhead(l, tickStart)); final long catchup = (long)Math.max( 1, @@ -85,7 +85,7 @@ // adjust ticksBehind so that it is not greater-than catchup if (ticksBehind > catchup) { -@@ -1790,7 +_,7 @@ +@@ -1785,7 +_,7 @@ long worldTime = level.getGameTime(); final ClientboundSetTimePacket worldPacket = new ClientboundSetTimePacket(worldTime, dayTime, doDaylight); for (Player entityhuman : level.players()) { @@ -94,7 +94,7 @@ continue; } ServerPlayer entityplayer = (ServerPlayer) entityhuman; -@@ -1957,7 +_,7 @@ +@@ -1952,7 +_,7 @@ @DontObfuscate public String getServerModName() {