Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37: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@a0ffb57 [ci skip] Small cleanup to mc utils patch
PaperMC/Paper@8c8862f Also check for the actual character length in ResourceLocation validation
This commit is contained in:
granny
2024-01-12 16:15:39 -08:00
parent 066e9f1e91
commit de54530c93
14 changed files with 79 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0096-Configurable-daylight-cycle.patch
View File

@@ -31,10 +31,10 @@ 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 73c1115cebb7d12874ae5de379bf9ac7481ac808..a19cf61172822ce199a280d1b7dc8cdb036a49ac 100644
index 45de633b7547646193f6cd34b9557cd54df013f5..586a46dc9f9e65e1f88bcfefc2f4e59d9cda55e9 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 {
@@ -215,6 +215,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 73c1115cebb7d12874ae5de379bf9ac7481ac808..a19cf61172822ce199a280d1b7dc8cdb
private final RandomSequences randomSequences;
public long lastMidTickExecuteFailure; // Paper - execute chunk tasks mid tick
@@ -793,6 +795,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -792,6 +794,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 73c1115cebb7d12874ae5de379bf9ac7481ac808..a19cf61172822ce199a280d1b7dc8cdb
}
// Paper start
@@ -983,6 +986,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -982,6 +985,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 73c1115cebb7d12874ae5de379bf9ac7481ac808..a19cf61172822ce199a280d1b7dc8cdb
this.setDayTime(this.levelData.getDayTime() + 1L);
}
@@ -991,7 +1001,21 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -990,7 +1000,21 @@ public class ServerLevel extends Level implements WorldGenLevel {
public void setDayTime(long timeOfDay) {
this.serverLevelData.setDayTime(timeOfDay);
@@ -88,7 +88,7 @@ index 73c1115cebb7d12874ae5de379bf9ac7481ac808..a19cf61172822ce199a280d1b7dc8cdb
public void tickCustomSpawners(boolean spawnMonsters, boolean spawnAnimals) {
Iterator iterator = this.customSpawners.iterator();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 2122658e5f5b6d0d9019f79f6c53717f7094abc0..efc2accce3eada889e919c19724206eab52dd627 100644
index 6ec5d3ea5e034066ec0e18c85c4ae59c6a1ddedd..a468de219bfc2c6304d57368c36851b39363b5bb 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -122,6 +122,13 @@ public class PurpurWorldConfig {