merge upstream

This commit is contained in:
Ben Kerllenevich
2022-06-08 13:50:11 -04:00
parent 6268dc4452
commit 63b5dc886a
12 changed files with 32 additions and 30 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Customizable sleeping actionbar messages
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index e584bcdca9ed8e3ccb3969b45011df3eb7624689..cbfc31d4b3aac2b681034106d8979a8779d529a5 100644
index 02adcf7c443536aa067e18c9d4b4253fa192c9b5..66c646d51428f898fe98a4f0a47cf35b339c6963 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -962,11 +962,27 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -963,11 +963,27 @@ public class ServerLevel extends Level implements WorldGenLevel {
if (this.canSleepThroughNights()) {
if (!this.getServer().isSingleplayer() || this.getServer().isPublished()) {
int i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);