Updated Upstream (Paper & Tuinity)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
02fbcbc Add reobf mappings patch for LevelChunk#level (CraftBukkit changes type) (#6079)
2641b91 Also deobfuscate secondary stacktraces in crash reports (#6078)
cc063e1 Fix incorrect variable usage in per-player mob spawning patch (#6077)

Tuinity Changes:
4867bfb Use correct y value for snow/ice formation
361be02 Update paper
This commit is contained in:
William Blake Galbreath
2021-07-04 12:49:50 -05:00
parent 1a2d7015b0
commit 8b67a588a8
15 changed files with 57 additions and 55 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 1327e9f3c81f2cf05986cc66fea1f91515f6a457..38dd5b8d756069b8cf9b5cbd570a34435151dd2d 100644
index dbf9d73027320efeed5fda3a610281fd737540df..42f6664ea6ddb3892b4549a78755efccd6f0f329 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;
@@ -34,7 +34,7 @@ index 1327e9f3c81f2cf05986cc66fea1f91515f6a457..38dd5b8d756069b8cf9b5cbd570a3443
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -1087,11 +1092,29 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
@@ -1089,11 +1094,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);