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@1c779c2 Update to 1.18.1 (#7076) PaperMC/Paper@901fd94 [ci skip] Update README
This commit is contained in:
@@ -5,10 +5,10 @@ Subject: [PATCH] Config for skipping night
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
index 1719f7ad18dfa054dc8c73f184baabb361160175..f4f87fb9ce5ebdb44ae4568c4b0d151f5c108fee 100644
|
||||
index 6742a56db677f46004ea8c54e724bc5f2c8b4e00..95a2455f53d2615bdc0e7eb8b5366f9a3e369cf5 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
@@ -604,7 +604,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
||||
@@ -607,7 +607,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
||||
int i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);
|
||||
long j;
|
||||
|
||||
@@ -18,7 +18,7 @@ index 1719f7ad18dfa054dc8c73f184baabb361160175..f4f87fb9ce5ebdb44ae4568c4b0d151f
|
||||
j = this.levelData.getDayTime() + 24000L;
|
||||
TimeSkipEvent event = new TimeSkipEvent(this.getWorld(), TimeSkipEvent.SkipReason.NIGHT_SKIP, (j - j % 24000L) - this.getDayTime());
|
||||
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
index f463c17192b609be4cbd66c8f475f3615cb5bf64..63e74fc0f42e5cfe2cb60434959d4c76e6b76093 100644
|
||||
index 0c913fcd0555c7fdfeb4de4186ea1aefd3ee3f36..c636ab51583cd3d62b2080896a91c9188b06f09d 100644
|
||||
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
@@ -312,6 +312,7 @@ public class PurpurWorldConfig {
|
||||
|
||||
Reference in New Issue
Block a user