From e40ada42af85e2269ec928a357bcbafd9ecd824b Mon Sep 17 00:00:00 2001 From: granny Date: Thu, 5 Jun 2025 19:50:36 -0700 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@921c5f93 Do not send update packets for saddle/body slots PaperMC/Paper@f00d9bce Second part of diff PaperMC/Paper@24cd24c8 Optimise CraftWorld#getLoadedChunks PaperMC/Paper@73c536da add new UI sound category PaperMC/Paper@a8df9346 Run generators PaperMC/Paper@77d1c233 Remove useless comments and FQN in source PaperMC/Paper@26a82545 fix some NPEs PaperMC/Paper@774c40e7 Update CraftWorld#getForceLoadedChunks to avoid using getChunkAt --- gradle.properties | 2 +- .../sources/net/minecraft/world/entity/Entity.java.patch | 2 +- .../src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 4065b6d41..14a06cb58 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.21.6-R0.1-SNAPSHOT mcVersion = 1.21.6-pre3 -paperCommit = f8bde6e1d0d303188572c5e6785b92dbbc07c218 +paperCommit = 774c40e71297c6e6d7d417639e1ce61cc79cc5ba org.gradle.configuration-cache = true org.gradle.caching = true diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch index 71e0e3828..9a2d5079a 100644 --- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch +++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch @@ -106,7 +106,7 @@ + if (hand == InteractionHand.OFF_HAND && (level().purpurConfig.villagerCanBeLeashed || level().purpurConfig.wanderingTraderCanBeLeashed) && this instanceof net.minecraft.world.entity.npc.AbstractVillager) return InteractionResult.CONSUME; // Purpur - Allow leashing villagers // Paper start - EntityUnleashEvent if (!org.bukkit.craftbukkit.event.CraftEventFactory.handlePlayerUnleashEntityEvent( - leashable2, player, hand, !player.hasInfiniteMaterials() + leashable2, player, hand, !player.hasInfiniteMaterials(), true @@ -3389,15 +_,18 @@ return Vec3.directionFromRotation(this.getRotationVector()); } 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 72ef202a0..eb9822cce 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 -@@ -2352,6 +_,50 @@ +@@ -2370,6 +_,50 @@ return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight()); }