Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@1281f4f Make region/lock shift accessors per world
This commit is contained in:
granny
2023-12-31 18:03:16 -08:00
parent c049bfbd53
commit 837307112c
13 changed files with 61 additions and 61 deletions

View File

@@ -31,7 +31,7 @@ index 2bc4073bb331e4b3beae9cccb06d3ca46f9d3b24..9de37c25f7a970326dc96a3dd4b2fddf
}
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 dfec321501523e1d953811961d1b5495cb41d815..3f95ede3602c3dea611ba9a6b4f6891419638283 100644
index 73c1115cebb7d12874ae5de379bf9ac7481ac808..a19cf61172822ce199a280d1b7dc8cdb036a49ac 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -216,6 +216,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -43,7 +43,7 @@ index dfec321501523e1d953811961d1b5495cb41d815..3f95ede3602c3dea611ba9a6b4f68914
private final RandomSequences randomSequences;
public long lastMidTickExecuteFailure; // Paper - execute chunk tasks mid tick
@@ -788,6 +790,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -793,6 +795,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.chunkTaskScheduler = new io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler(this, io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.workerThreads); // Paper - rewrite chunk system
this.entityLookup = new io.papermc.paper.chunk.system.entity.EntityLookup(this, new EntityCallbacks()); // Paper - rewrite chunk system
@@ -51,7 +51,7 @@ index dfec321501523e1d953811961d1b5495cb41d815..3f95ede3602c3dea611ba9a6b4f68914
}
// Paper start
@@ -978,6 +981,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -983,6 +986,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 dfec321501523e1d953811961d1b5495cb41d815..3f95ede3602c3dea611ba9a6b4f68914
this.setDayTime(this.levelData.getDayTime() + 1L);
}
@@ -986,7 +996,21 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -991,7 +1001,21 @@ public class ServerLevel extends Level implements WorldGenLevel {
public void setDayTime(long timeOfDay) {
this.serverLevelData.setDayTime(timeOfDay);