Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@05ed6a6 Fix priority scheduling logic
PaperMC/Paper@967f98a Optimise chunk tick checking during chunk tick
PaperMC/Paper@00b949f Remove Moonrise utils to MCUtils, remove duplicated/unused utils
PaperMC/Paper@4efd24b Remove unused chunk system hooks in MCUtils
PaperMC/Paper@b653276 Finish chunk tick iteration optimisation port from Moonrise
PaperMC/Paper@2df5bba Log throwable when failing to save chunk/poi/entity data
PaperMC/Paper@44c3dd0 fix exact choice shapeless recipes (#10973)
This commit is contained in:
granny
2024-07-17 19:14:12 -07:00
parent 8f0f20df9a
commit 86a65436a7
28 changed files with 200 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0091-Configurable-daylight-cycle.patch
View File

@@ -18,10 +18,10 @@ index 76ef195a5074006b009acd9cc1744667c6aecbb9..659577549e132754281df76a7a1bfd88
public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) {
this.gameTime = time;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index e1b0c35df3cc22762bdb5cb0fcb66fb9c61f1e59..8e1e74889884ec2f957602fa669b842e3eef047d 100644
index d22f6854a9142b682be3b5bb3ff58228f6457664..5b92d2b80bbbff7b1a2c8ba2c59c16ca8396de73 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1772,7 +1772,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1771,7 +1771,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
long worldTime = level.getGameTime();
final ClientboundSetTimePacket worldPacket = new ClientboundSetTimePacket(worldTime, dayTime, doDaylight);
for (Player entityhuman : level.players()) {
@@ -31,7 +31,7 @@ index e1b0c35df3cc22762bdb5cb0fcb66fb9c61f1e59..8e1e74889884ec2f957602fa669b842e
}
ServerPlayer entityplayer = (ServerPlayer) entityhuman;
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index b1399c43711e9da0de7259196f3304fa29a17fe7..6301e0d2f3807e163a1a7267d893076a90351312 100644
index 804059a642f3ae53cd9732841c829aedc40b9ef2..f7e586f069a55728939c435ee9127b3f04941991 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -221,6 +221,8 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -43,7 +43,7 @@ index b1399c43711e9da0de7259196f3304fa29a17fe7..6301e0d2f3807e163a1a7267d893076a
private final RandomSequences randomSequences;
// CraftBukkit start
@@ -632,6 +634,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -651,6 +653,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
this.chunkTaskScheduler = new ca.spottedleaf.moonrise.patches.chunk_system.scheduling.ChunkTaskScheduler((ServerLevel)(Object)this, ca.spottedleaf.moonrise.common.util.MoonriseCommon.WORKER_POOL);
// Paper end - rewrite chunk system
this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
@@ -51,7 +51,7 @@ index b1399c43711e9da0de7259196f3304fa29a17fe7..6301e0d2f3807e163a1a7267d893076a
}
// Paper start
@@ -808,6 +811,13 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -827,6 +830,13 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
this.serverLevelData.setGameTime(i);
this.serverLevelData.getScheduledEvents().tick(this.server, i);
if (this.levelData.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) {
@@ -65,7 +65,7 @@ index b1399c43711e9da0de7259196f3304fa29a17fe7..6301e0d2f3807e163a1a7267d893076a
this.setDayTime(this.levelData.getDayTime() + 1L);
}
@@ -816,7 +826,21 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -835,7 +845,21 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
public void setDayTime(long timeOfDay) {
this.serverLevelData.setDayTime(timeOfDay);