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

Update Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly
This commit is contained in:
Ben Kerllenevich
2021-08-31 07:23:46 -04:00
parent 64547876a0
commit 19293aabc5
36 changed files with 113 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,10 +18,10 @@ index 689ad22925b2561f7c8db961743eb1f821dbb25f..fa3c960992cc240161817e54659d83fe
public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) {
this.gameTime = time % 192000; // Paper - fix guardian beam
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index f959fab7c941505fcb39b116c05a9e9cd401b090..f0b62a3ec03cdbba853be815834e56c4d136197c 100644
index 1ea18770c65583e2ed604eb15d15067a638a33a2..85b3ffb58b06ff6342abdd8948c1607079c4ee8f 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -196,6 +196,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -195,6 +195,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
final Int2ObjectMap<EnderDragonPart> dragonParts;
private final StructureFeatureManager structureFeatureManager;
private final boolean tickTime;
@@ -29,7 +29,7 @@ index f959fab7c941505fcb39b116c05a9e9cd401b090..f0b62a3ec03cdbba853be815834e56c4
// Paper start - execute chunk tasks mid tick
public long lastMidTickExecuteFailure;
// Paper end - execute chunk tasks mid tick
@@ -573,6 +574,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -572,6 +573,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
@@ -37,7 +37,7 @@ index f959fab7c941505fcb39b116c05a9e9cd401b090..f0b62a3ec03cdbba853be815834e56c4
}
public void setWeatherParameters(int clearDuration, int rainDuration, boolean raining, boolean thundering) {
@@ -838,6 +840,18 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -833,6 +835,18 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.liquidTicks.nextTick(); // Paper
this.serverLevelData.getScheduledEvents().tick(this.server, i);
if (this.levelData.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) {
@@ -56,7 +56,7 @@ index f959fab7c941505fcb39b116c05a9e9cd401b090..f0b62a3ec03cdbba853be815834e56c4
this.setDayTime(this.levelData.getDayTime() + 1L);
}
@@ -846,6 +860,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -841,6 +855,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
public void setDayTime(long timeOfDay) {
this.serverLevelData.setDayTime(timeOfDay);