Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07:43 +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@cfe3ad1 Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@02b5ec4 fix 2 more migration issues
This commit is contained in:
William Blake Galbreath
2022-06-09 23:54:39 -05:00
parent 17ea327e08
commit a214265592
13 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0102-Configurable-daylight-cycle.patch
View File

@@ -31,10 +31,10 @@ index 863cb20d9f67f9399dc0bd5c5f7cd955519f7e1d..f1198c07e479954a1be1e9fe52329a66
}
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 3dea01cdb2332817ea7185900bb178efa8ae0f73..7f0de91fa60f527c9396a67dde060c13d0ee5444 100644
index 31368f0747e1e63d9b2f66db69dacc3af05d41a5..f20a904362fbbf1e6ff4ace1af78cece87f9f431 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -209,6 +209,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -210,6 +210,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
private final StructureManager structureManager;
private final StructureCheck structureCheck;
private final boolean tickTime;
@@ -43,7 +43,7 @@ index 3dea01cdb2332817ea7185900bb178efa8ae0f73..7f0de91fa60f527c9396a67dde060c13
public long lastMidTickExecuteFailure; // Paper - execute chunk tasks mid tick
// CraftBukkit start
@@ -581,6 +583,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -584,6 +586,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
this.asyncChunkTaskManager = new com.destroystokyo.paper.io.chunk.ChunkTaskManager(this); // Paper
@@ -51,7 +51,7 @@ index 3dea01cdb2332817ea7185900bb178efa8ae0f73..7f0de91fa60f527c9396a67dde060c13
}
public void setWeatherParameters(int clearDuration, int rainDuration, boolean raining, boolean thundering) {
@@ -738,6 +741,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -741,6 +744,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.serverLevelData.setGameTime(i);
this.serverLevelData.getScheduledEvents().tick(this.server, i);
if (this.levelData.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) {
@@ -65,7 +65,7 @@ index 3dea01cdb2332817ea7185900bb178efa8ae0f73..7f0de91fa60f527c9396a67dde060c13
this.setDayTime(this.levelData.getDayTime() + 1L);
}
@@ -746,7 +756,21 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -749,7 +759,21 @@ public class ServerLevel extends Level implements WorldGenLevel {
public void setDayTime(long timeOfDay) {
this.serverLevelData.setDayTime(timeOfDay);