Preliminary update to 1.17.1

This commit is contained in:
William Blake Galbreath
2021-07-06 16:25:46 -05:00
parent 89c9c902b1
commit 471d6bf4c1
202 changed files with 994 additions and 20192 deletions

View File

@@ -5,7 +5,7 @@ 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 7f81ac2cd975b17fc2f3d4bc21111515658663ae..05635818b4ae597b6b2053dbf9c8351f6ea9ea42 100644
index 8d56327ee9ff88baba34af2931c2f074cdb8f078..fd68db19b041df90b3c4ff15dc0e5b2f4f9bb860 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -4,6 +4,7 @@ import com.google.common.annotations.VisibleForTesting;
@@ -26,7 +26,7 @@ index 7f81ac2cd975b17fc2f3d4bc21111515658663ae..05635818b4ae597b6b2053dbf9c8351f
import net.minecraft.CrashReport;
import net.minecraft.core.BlockPos;
import net.minecraft.core.DefaultedRegistry;
@@ -158,6 +162,7 @@ import net.minecraft.world.phys.Vec3;
@@ -157,6 +161,7 @@ import net.minecraft.world.phys.Vec3;
import net.minecraft.world.phys.shapes.BooleanOp;
import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.phys.shapes.VoxelShape;
@@ -34,7 +34,7 @@ index 7f81ac2cd975b17fc2f3d4bc21111515658663ae..05635818b4ae597b6b2053dbf9c8351f
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -1089,11 +1094,29 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
@@ -889,11 +894,29 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
if (this.canSleepThroughNights()) {
if (!this.getServer().isSingleplayer() || this.getServer().isPublished()) {
int i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);