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@aabf676 Prevent unloading worlds with pending player logins
This commit is contained in:
BillyGalbreath
2022-08-28 14:45:03 -05:00
parent 1c88954c70
commit 7005356a4d
21 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,10 +31,10 @@ index b1098555ea7c96815dc85ab440544d9db7fee978..eb12fed7ee6d7d3a5f5b9e99d8f11b38
}
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 5b6e2fcf0f8fc854c08dcdf40bdae91fd8d405f5..64edb1e92e9203f4e0a691adc69bdbbe8ec36607 100644
index 67bc56e2abbaeed93591eb3ec6242fe1e09cdfae..cc486f43325bc8910e5366cc8a473891e2176461 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -211,6 +211,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -212,6 +212,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 5b6e2fcf0f8fc854c08dcdf40bdae91fd8d405f5..64edb1e92e9203f4e0a691adc69bdbbe
public long lastMidTickExecuteFailure; // Paper - execute chunk tasks mid tick
// CraftBukkit start
@@ -585,6 +587,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -588,6 +590,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 5b6e2fcf0f8fc854c08dcdf40bdae91fd8d405f5..64edb1e92e9203f4e0a691adc69bdbbe
}
public void setWeatherParameters(int clearDuration, int rainDuration, boolean raining, boolean thundering) {
@@ -755,6 +758,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -758,6 +761,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 5b6e2fcf0f8fc854c08dcdf40bdae91fd8d405f5..64edb1e92e9203f4e0a691adc69bdbbe
this.setDayTime(this.levelData.getDayTime() + 1L);
}
@@ -763,7 +773,21 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -766,7 +776,21 @@ public class ServerLevel extends Level implements WorldGenLevel {
public void setDayTime(long timeOfDay) {
this.serverLevelData.setDayTime(timeOfDay);