From 6486393cd9620bc3b543728a721ff086b11e3d27 Mon Sep 17 00:00:00 2001 From: Samsuik Date: Thu, 18 Sep 2025 23:25:39 +0100 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@38fe16b Fix missing reason in disconnectAsync (#13001) PaperMC/Paper@b0da38c Repository details in RuntimeException for MavenLibraryResolver#addRepository (#12939) PaperMC/Paper@1922be9 Update custom tags (#12183) PaperMC/Paper@79cf135 Ignore HopperInventorySearchEvent when it has no listeners (#13009) PaperMC/Paper@ea014f7 feat: add stuckEntityPoiRetryDelay config (#12949) PaperMC/Paper@a9e7674 Support for showNotification in PlayerRecipeDiscoverEvent (#12992) PaperMC/Paper@5622c9d Expose attribute sentiment (#12974) PaperMC/Paper@42b653b Expose more argument types (#12665) PaperMC/Paper@52d9a22 [ci skip] Fix typo in Display javadoc (#13010) PaperMC/Paper@614e9ac Improve APIs around riptide tridents (#12996) PaperMC/Paper@51706e5 Fixed DyeItem sheep dye hunk PaperMC/Paper@b6168b7 Get console Brig suggestions from main thread fixes #13027 (#13028) PaperMC/Paper@9d1d0ef Add and call RegionizedServerInitEvent from Folia (#13034) PaperMC/Paper@704107c Resend frozen ticks when cancelling EntityInsideBlockEvent for powder snow fixes #13033 (#13035) PaperMC/Paper@63cd4af Fix createProfile not always returning a new profile (#13036) PaperMC/Paper@49ca2d2 chore: remove experimental status from Damageable#damage (#13021) PaperMC/Paper@65641d1 Only log name instead of full profile for configuration phase disconnects (#13038) PaperMC/Paper@78aecfe Do not remove plugin chunk tickets on shutdown PaperMC/Paper@9aaaadf Backport DFU changes from snapshots PaperMC/Paper@19156cd Give the right amount of experience after mending (#13047) PaperMC/Paper@29c8822 Remove no longer needed MC-210802 fix (#13059) --- gradle.properties | 2 +- .../0001-Track-block-changes-and-level-tick-scheduler.patch | 6 +++--- .../sources/net/minecraft/server/MinecraftServer.java.patch | 4 ++-- .../net/minecraft/world/entity/LivingEntity.java.patch | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 708a28f..eab7eba 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.samsuik.sakura version=1.21.8-R0.1-SNAPSHOT mcVersion=1.21.8 -paperRef=f866a5fd5497798590aebefb99e417c97a8e1e76 +paperRef=29c8822d90899c89d2689338e81a98f690bcba12 org.gradle.jvmargs=-Xmx2G org.gradle.vfs.watch=false diff --git a/sakura-server/minecraft-patches/features/0001-Track-block-changes-and-level-tick-scheduler.patch b/sakura-server/minecraft-patches/features/0001-Track-block-changes-and-level-tick-scheduler.patch index b72364b..26ca7e5 100644 --- a/sakura-server/minecraft-patches/features/0001-Track-block-changes-and-level-tick-scheduler.patch +++ b/sakura-server/minecraft-patches/features/0001-Track-block-changes-and-level-tick-scheduler.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Track block changes and level tick scheduler diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 3f8d66d26b498d88f225b446ec76379ec7df1e7b..f13c8afe65119b80653cac8dfb0499a40430f1f5 100644 +index 61d5876aa60e8e257b5cdf8d343370153d58f841..84c00a30e15a703227e6161ba7929fbf43cf59cc 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -1749,6 +1749,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop, AutoCl diff --git a/sakura-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch b/sakura-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch index 02fdc5c..9726f95 100644 --- a/sakura-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch +++ b/sakura-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch @@ -37,7 +37,7 @@ } private void readScoreboard(DimensionDataStorage dataStorage) { -@@ -1222,6 +_,7 @@ +@@ -1223,6 +_,7 @@ if (++MinecraftServer.currentTick % MinecraftServer.SAMPLE_INTERVAL == 0) { final long diff = currentTime - tickSection; final java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP); @@ -45,7 +45,7 @@ tps1.add(currentTps, diff); tps5.add(currentTps, diff); tps15.add(currentTps, diff); -@@ -1259,6 +_,7 @@ +@@ -1260,6 +_,7 @@ // Paper end - rewrite chunk system this.tickFrame.end(); profilerFiller.popPush("nextTickWait"); diff --git a/sakura-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch b/sakura-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch index 1d3c85d..786b96a 100644 --- a/sakura-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch +++ b/sakura-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch @@ -201,7 +201,7 @@ this.hurtServer(serverLevel, this.damageSources().drown(), 1.0F); } } -@@ -4157,6 +_,13 @@ +@@ -4173,6 +_,13 @@ if (!this.isUsingItem()) { return null; } else {