mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 18:07:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@f6a69de Undeprecate getOfflinePlayer (#7773) PaperMC/Paper@a117da6 Add PlayerStopUsingItemEvent (#7787) PaperMC/Paper@f3a8a0b FallingBlock auto expire setting (#7037) PaperMC/Paper@4219389 Don't tick markers (#7299) PaperMC/Paper@2515bc4 Improve configurable door difficulty (#6985) PaperMC/Paper@8c9d98e Clean unused field for Configurable door breaking difficulty (#7793) PaperMC/Paper@b831784 Only log for passenger / vehicle world mismatch PaperMC/Paper@7a6163b Add Alternate Current's redstone implementation as an alternative to Vanilla and Eigencraft's. (#7701) PaperMC/Paper@1a17a83 Move redstone config changes to Eigencraft patch
This commit is contained in:
@@ -31,7 +31,7 @@ index d011944a64c4e61b7285325a37ab05a540c99b5c..b15647b6cf2495b15a994ab32a4d53cb
|
||||
}
|
||||
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 321f6a27ef87261db910df421ed453570c8a81ac..5f3090e86b885d6cac8688082046408d6b06354f 100644
|
||||
index 40d5196cbb3567d642925cd7f0d2924884c46347..09800a0c113e1e70ad773e55bd370e7b3c36d463 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
@@ -202,6 +202,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
||||
@@ -43,7 +43,7 @@ index 321f6a27ef87261db910df421ed453570c8a81ac..5f3090e86b885d6cac8688082046408d
|
||||
// Paper start - execute chunk tasks mid tick
|
||||
public long lastMidTickExecuteFailure;
|
||||
// Paper end - execute chunk tasks mid tick
|
||||
@@ -565,6 +567,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
||||
@@ -566,6 +568,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 321f6a27ef87261db910df421ed453570c8a81ac..5f3090e86b885d6cac8688082046408d
|
||||
}
|
||||
|
||||
public void setWeatherParameters(int clearDuration, int rainDuration, boolean raining, boolean thundering) {
|
||||
@@ -733,6 +736,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
||||
@@ -734,6 +737,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 321f6a27ef87261db910df421ed453570c8a81ac..5f3090e86b885d6cac8688082046408d
|
||||
this.setDayTime(this.levelData.getDayTime() + 1L);
|
||||
}
|
||||
|
||||
@@ -741,7 +751,21 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
||||
@@ -742,7 +752,21 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
||||
|
||||
public void setDayTime(long timeOfDay) {
|
||||
this.serverLevelData.setDayTime(timeOfDay);
|
||||
|
||||
Reference in New Issue
Block a user