Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2025-12-23 00:39:20 +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@cafef9c [ci skip] Move EntityUtil to correct directory (#12092)
PaperMC/Paper@fa5824e Add skipTripwireHookPlacementValidation (#12091)
PaperMC/Paper@3bd69f2 [ci skip] Enhance javadoc for World#setAutoSave method (#12088)
PaperMC/Paper@13c80a5 [ci skip] Fix PlayerShearBlockEvent javadoc typos (#12101)
PaperMC/Paper@db2aa18 [ci skip] Fix incomplete example in javadocs for PreFlattenTagRegistrar (#12102)
PaperMC/Paper@cf7c6c7 [ci skip] Fix incomplete example in javadocs for PostFlattenTagRegistrar (#12103)
PaperMC/Paper@072a831 Add proper attached blocks API to AbstractArrow (#12099)
PaperMC/Paper@1be2e5f Fix vanilla map decorations sending when not dirty (#12098)
PaperMC/Paper@a06179a Update entity effect (#12104)
PaperMC/Paper@e616498 Add Vault block API (#12068)
PaperMC/Paper@0a04c3f Fix some NPEs (#12105)
PaperMC/Paper@0680485 Expand TrialSpawner API (#12025)
PaperMC/Paper@46f4fda Add support for rotation argument handling (#12090)
This commit is contained in:
Samsuik
2025-02-13 01:16:38 +00:00
parent 4cc20bc711
commit d3e886a5c8
5 changed files with 9 additions and 9 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.4-R0.1-SNAPSHOT
mcVersion=1.21.4
paperRef=edacfdf4624735d093413e64b4efd192f72d844e
paperRef=46f4fdaae3661941ac86f2157e625d907fdd8e81
org.gradle.jvmargs=-Xmx2G
org.gradle.vfs.watch=false

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
index 7ef1df9c0b3e2226a08aa4e820318402bee77a67..67c6c6cb96a8aace48165233923b97fcae907b4c 100644
index 900ea27111dccce70f2c2af891d0064c487dce2e..93fead843e419817e8a0ae46d77896c8c674096a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2404,6 +2404,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2405,6 +2405,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
handle.keepLevel = data.getBoolean("keepLevel");
}
}
@@ -22,7 +22,7 @@ index 7ef1df9c0b3e2226a08aa4e820318402bee77a67..67c6c6cb96a8aace48165233923b97fc
}
public void setExtraData(CompoundTag nbttagcompound) {
@@ -2433,6 +2440,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2434,6 +2441,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
paper.putLong("LastLogin", handle.loginTime);
paper.putLong("LastSeen", System.currentTimeMillis());
// Paper end
@@ -34,7 +34,7 @@ index 7ef1df9c0b3e2226a08aa4e820318402bee77a67..67c6c6cb96a8aace48165233923b97fc
}
@Override
@@ -3094,6 +3106,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3095,6 +3107,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().allowsListing();
}

4
sakura-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch
View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1087,6 +_,7 @@
@@ -1088,6 +_,7 @@
org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
this.console.paperConfigurations.reloadConfigs(this.console);
@@ -8,7 +8,7 @@
for (ServerLevel world : this.console.getAllLevels()) {
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
@@ -1118,6 +_,7 @@
@@ -1119,6 +_,7 @@
this.reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper

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

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -288,6 +_,12 @@
@@ -282,6 +_,12 @@
).isValid();
}
// Paper end

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
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -232,6 +_,18 @@
@@ -233,6 +_,18 @@
this.firstPlayed = System.currentTimeMillis();
}