From d0b1b32e6f97c7a69bcebe04544589078133f0a9 Mon Sep 17 00:00:00 2001 From: granny Date: Sat, 10 Jan 2026 18:48:29 -0800 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@b3edd3f4 Clamp respawn location pitch to correct bounds (#13509) PaperMC/Paper@4b35f5cb Fix using experience bottle does not award item used stat (#13522) PaperMC/Paper@a0f626b5 Fix backward compat for EnchantmentTarget.WEAPON (#13508) --- gradle.properties | 2 +- .../minecraft-patches/features/0001-Ridables.patch | 6 +++--- .../0020-Setting-to-reintroduce-end-void-rings.patch | 4 ++-- .../net/minecraft/server/MinecraftServer.java.patch | 12 ++++++------ .../minecraft/server/level/ServerPlayer.java.patch | 2 +- .../org/bukkit/craftbukkit/CraftWorld.java.patch | 2 +- .../bukkit/craftbukkit/entity/CraftPlayer.java.patch | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/gradle.properties b/gradle.properties index a6b7a8a5e..eead44233 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 = 8556cb41ce372d1bd6f54f1ee93a5947497b4bd7 +paperCommit = a0f626b55215dfb4d3b1e9763901bdeee9184e48 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 a2ce458df..b7c783851 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 2e7dd34a7ba74b6545ccc92ba109def077c2618f..e842e82e8915f8e0d95013f7f731914202dc6b7b 100644 +index 8793253032e43920d9668079d5a2537ac5aec415..2717e0a1fd8a3cc7d4a6f8d18659293e86025cd0 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -1838,6 +1838,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 @@ -42,7 +42,7 @@ index 5130c0067f01eec31c69b9e71d904f932943b922..853bb92c034b6361ff8c55daf52f38a2 @Override public @Nullable LevelChunk getChunkIfLoaded(int x, int z) { diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 4d3ccd5373a75227e613c13df1d32cab5ce124bd..1423ee429d090955da06f23b0df0727359d11401 100644 +index a16813766ad244c002a752b0c03779c550d39e75..74f1230a2a7ca443ef4dc9572069529279b89552 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -772,6 +772,15 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc 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 8f4656ec9..01a35e2df 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 e842e82e8915f8e0d95013f7f731914202dc6b7b..fc56c5cace242821b8d40847e01081ee41c61ef6 100644 +index 2717e0a1fd8a3cc7d4a6f8d18659293e86025cd0..d09d59cfa274c16e86c2d0a3d0339b7e72be3d13 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -1320,6 +1320,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop catchup) { -@@ -1792,7 +_,7 @@ +@@ -1790,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; -@@ -1959,7 +_,7 @@ +@@ -1957,7 +_,7 @@ @DontObfuscate public String getServerModName() { diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch index e61821aca..9939585d4 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch @@ -215,7 +215,7 @@ public ServerStatsCounter getStats() { return this.stats; -@@ -3128,4 +_,65 @@ +@@ -3126,4 +_,65 @@ return (org.bukkit.craftbukkit.entity.CraftPlayer) super.getBukkitEntity(); } // CraftBukkit end diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch index 7fcd80381..c27a30f59 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1939,6 +_,52 @@ +@@ -1926,6 +_,52 @@ return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight()); } diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch index 57f7dc3d0..1b5e14d49 100644 --- a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -582,10 +_,15 @@ +@@ -580,10 +_,15 @@ @Override public void setPlayerListName(String name) { @@ -17,7 +17,7 @@ if (this.getHandle().connection == null) return; // Paper - Updates are possible before the player has fully joined for (ServerPlayer player : this.server.getHandle().players) { if (player.getBukkitEntity().canSee(this)) { -@@ -988,6 +_,80 @@ +@@ -984,6 +_,80 @@ } } @@ -98,7 +98,7 @@ @Override public void sendBlockDamage(Location loc, float progress, org.bukkit.entity.Entity source) { Preconditions.checkArgument(source != null, "source must not be null"); -@@ -2495,6 +_,28 @@ +@@ -2489,6 +_,28 @@ public float getWalkSpeed() { return this.getHandle().getAbilities().walkingSpeed * 2f; }