Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@d5f1ffc Remove somewhat broken patch
This commit is contained in:
BillyGalbreath
2022-12-19 11:11:49 -06:00
parent e2365fa207
commit 4a580c4122
39 changed files with 181 additions and 181 deletions

View File

@@ -31,10 +31,10 @@ index 96f50760dec9fb7ec317b500ce5cd6a69eb56f02..1953eaab247d7482773cac79dafd651a
}
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 cf72c46fb9b6a223e6c96103243ae183e6ce3ec9..0ded829303669767df32964e89e4d8823d312b49 100644
index b37db189635f49c0dc7a3cfdc6611222ac78c0cd..46e507ba8816cdc9074ec9aadd5b4b2b22cb12d1 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -215,6 +215,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -214,6 +214,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 cf72c46fb9b6a223e6c96103243ae183e6ce3ec9..0ded829303669767df32964e89e4d882
public long lastMidTickExecuteFailure; // Paper - execute chunk tasks mid tick
// CraftBukkit start
@@ -625,6 +627,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -623,6 +625,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 cf72c46fb9b6a223e6c96103243ae183e6ce3ec9..0ded829303669767df32964e89e4d882
}
public void setWeatherParameters(int clearDuration, int rainDuration, boolean raining, boolean thundering) {
@@ -794,6 +797,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -792,6 +795,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 cf72c46fb9b6a223e6c96103243ae183e6ce3ec9..0ded829303669767df32964e89e4d882
this.setDayTime(this.levelData.getDayTime() + 1L);
}
@@ -802,7 +812,21 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -800,7 +810,21 @@ public class ServerLevel extends Level implements WorldGenLevel {
public void setDayTime(long timeOfDay) {
this.serverLevelData.setDayTime(timeOfDay);