Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2025-12-19 14:59:30 +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@1d2d956 fix(#13144): Entity pathfinding paths do not appear with 1.21.9 debug flag enabled (#13202)
PaperMC/Paper@cf02a07 Add Particle.Spell support to ParticleBuilder#color(Color, float) (#13128)
PaperMC/Paper@97452e1 Improvements for Player#openBook (#12582)
PaperMC/Paper@d16e03f [ci skip] Add IntelliJ tips to CONTRIBUTING.md (#13299)
PaperMC/Paper@0e10753 Update ConcurrentUtil to 0.0.6
PaperMC/Paper@f393100 Update ConcurrentUtil to 0.0.7
PaperMC/Paper@9fc21bc Promote build channel from BETA to STABLE
PaperMC/Paper@f67a1b6 fix: Player#setPlayerTime sends time update packet to client (#13315)
PaperMC/Paper@af06383 Add field renames for lead sounds and iron chain (#13168)
PaperMC/Paper@f8cf03d [ci skip] Mention damage behavior for Server#createWorldBorder (#13338)
PaperMC/Paper@df4b668 Restore legacy command restrictions
PaperMC/Paper@92ed3f0 Fix wrong translation key in /give command (#13364)
This commit is contained in:
Samsuik
2025-12-06 12:20:39 +00:00
parent 208753a2cc
commit ef63d89095
5 changed files with 8 additions and 8 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.10-R0.1-SNAPSHOT version=1.21.10-R0.1-SNAPSHOT
mcVersion=1.21.10 mcVersion=1.21.10
paperRef=1f31ee5ebe45d97a596a4429d9871e3f8910cd28 paperRef=92ed3f00b13692d349ba09d6ab34794ca46b37fa
org.gradle.jvmargs=-Xmx2G org.gradle.jvmargs=-Xmx2G
org.gradle.vfs.watch=false org.gradle.vfs.watch=false

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

2
sakura-server/build.gradle.kts.patch
View File

@@ -54,7 +54,7 @@
dependencies { dependencies {
- implementation(project(":paper-api")) - implementation(project(":paper-api"))
+ implementation(project(":$serverBrand-api")) + implementation(project(":$serverBrand-api"))
implementation("ca.spottedleaf:concurrentutil:0.0.5") implementation("ca.spottedleaf:concurrentutil:0.0.7")
implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+ implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21 implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
@@ -204,7 +_,7 @@ @@ -204,7 +_,7 @@

8
sakura-server/paper-patches/features/0001-Client-Visibility-Settings.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Client Visibility Settings
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 24751f4afa1ce6cd45d2210cbf59674508e58623..ceef50ba9f0da11b6c06122fcae44124ceae3f9d 100644 index e8bd5c63c9d7ea9f0ba847b897ebb6072f40a4dc..7251ea305abb977d66d8c37a0094cdbf4e0d74cf 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2157,6 +2157,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa @@ -2174,6 +2174,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
handle.expToDrop = data.getIntOr("expToDrop", 0); handle.expToDrop = data.getIntOr("expToDrop", 0);
handle.keepLevel = data.getBooleanOr("keepLevel", false); handle.keepLevel = data.getBooleanOr("keepLevel", false);
}); });
@@ -20,7 +20,7 @@ index 24751f4afa1ce6cd45d2210cbf59674508e58623..ceef50ba9f0da11b6c06122fcae44124
} }
public void setExtraData(ValueOutput output) { public void setExtraData(ValueOutput output) {
@@ -2178,6 +2183,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa @@ -2195,6 +2200,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
paper.putLong("LastLogin", handle.loginTime); paper.putLong("LastLogin", handle.loginTime);
paper.putLong("LastSeen", System.currentTimeMillis()); paper.putLong("LastSeen", System.currentTimeMillis());
// Paper end // Paper end
@@ -31,7 +31,7 @@ index 24751f4afa1ce6cd45d2210cbf59674508e58623..ceef50ba9f0da11b6c06122fcae44124
} }
@Override @Override
@@ -2756,6 +2765,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa @@ -2762,6 +2771,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
return this.getHandle().allowsListing(); return this.getHandle().allowsListing();
} }

2
sakura-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch
View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -243,6 +_,18 @@ @@ -251,6 +_,18 @@
this.firstPlayed = System.currentTimeMillis(); this.firstPlayed = System.currentTimeMillis();
} }