Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2025-12-22 08:19:26 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source 
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)
This commit is contained in:
Samsuik
2025-09-18 23:25:39 +01:00
parent 65e1048cd0
commit 6486393cd9
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group=me.samsuik.sakura
version=1.21.8-R0.1-SNAPSHOT version=1.21.8-R0.1-SNAPSHOT
mcVersion=1.21.8 mcVersion=1.21.8
paperRef=f866a5fd5497798590aebefb99e417c97a8e1e76 paperRef=29c8822d90899c89d2689338e81a98f690bcba12
org.gradle.jvmargs=-Xmx2G org.gradle.jvmargs=-Xmx2G
org.gradle.vfs.watch=false org.gradle.vfs.watch=false

6
sakura-server/minecraft-patches/features/0001-Track-block-changes-and-level-tick-scheduler.patch
View File

@@ -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 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 --- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java
@@ -1749,6 +1749,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa @@ -1750,6 +1750,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
profilerFiller.pop(); profilerFiller.pop();
profilerFiller.pop(); profilerFiller.pop();
serverLevel.explosionDensityCache.clear(); // Paper - Optimize explosions serverLevel.explosionDensityCache.clear(); // Paper - Optimize explosions
@@ -17,7 +17,7 @@ index 3f8d66d26b498d88f225b446ec76379ec7df1e7b..f13c8afe65119b80653cac8dfb0499a4
this.isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked this.isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
index ad5b75c9efa830823a7c09bcdf4b326c4c583803..7aa8d68800cdec91f24f015f9b2d56e969a7be17 100644 index c75099957654ee65edfafab449e665ea1fcddf5b..3ecb573ea476336f367bd3abbaff8e7073623d82 100644
--- a/net/minecraft/world/level/Level.java --- a/net/minecraft/world/level/Level.java
+++ b/net/minecraft/world/level/Level.java +++ b/net/minecraft/world/level/Level.java
@@ -824,6 +824,10 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl @@ -824,6 +824,10 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl

4
sakura-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch
View File

@@ -37,7 +37,7 @@
} }
private void readScoreboard(DimensionDataStorage dataStorage) { private void readScoreboard(DimensionDataStorage dataStorage) {
@@ -1222,6 +_,7 @@ @@ -1223,6 +_,7 @@
if (++MinecraftServer.currentTick % MinecraftServer.SAMPLE_INTERVAL == 0) { if (++MinecraftServer.currentTick % MinecraftServer.SAMPLE_INTERVAL == 0) {
final long diff = currentTime - tickSection; final long diff = currentTime - tickSection;
final java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP); 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); tps1.add(currentTps, diff);
tps5.add(currentTps, diff); tps5.add(currentTps, diff);
tps15.add(currentTps, diff); tps15.add(currentTps, diff);
@@ -1259,6 +_,7 @@ @@ -1260,6 +_,7 @@
// Paper end - rewrite chunk system // Paper end - rewrite chunk system
this.tickFrame.end(); this.tickFrame.end();
profilerFiller.popPush("nextTickWait"); profilerFiller.popPush("nextTickWait");

2
sakura-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch
View File

@@ -201,7 +201,7 @@
this.hurtServer(serverLevel, this.damageSources().drown(), 1.0F); this.hurtServer(serverLevel, this.damageSources().drown(), 1.0F);
} }
} }
@@ -4157,6 +_,13 @@ @@ -4173,6 +_,13 @@
if (!this.isUsingItem()) { if (!this.isUsingItem()) {
return null; return null;
} else { } else {