Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@b1afebb Force close world loading screen on join (#7529)
PaperMC/Paper@d3caeeb Fix early registry access in xray patch
PaperMC/Paper@c6ea84c Drop unneeded desync patch
This commit is contained in:
BillyGalbreath
2022-03-02 06:16:29 -06:00
parent 30882358d7
commit 5d79d46605
9 changed files with 18 additions and 58 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add permission for F3+N debug
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index aafc0d7275a8dc1df2c73974b9b77166d568cc85..9311a5fbaa17c9cd95940b4ddfea6fdb06f9d397 100644
index 6ad2ccf91a384bf431e3716d374f0eb45c6c0fe8..fe5191550b0472a33122f3378142cdef83c89ce5 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1162,6 +1162,7 @@ public abstract class PlayerList {
@@ -1169,6 +1169,7 @@ public abstract class PlayerList {
} else {
b0 = (byte) (24 + permissionLevel);
}