merge upstream

This commit is contained in:
Ben Kerllenevich
2022-06-08 14:35:27 -04:00
parent 109b1d882b
commit 9dff3ce224
9 changed files with 22 additions and 22 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 e3d4d6c6205208fa007ec320a06a16d56319a7ac..5cd91d4de2521dec6cd9822b3eac82590aa9674b 100644
index d7e65c889167de315206ae2a36f305c6255950a1..a4a895a54ad0266301d50f95eaec3a2bb604f8f1 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1183,6 +1183,7 @@ public abstract class PlayerList {
@@ -1186,6 +1186,7 @@ public abstract class PlayerList {
} else {
b0 = (byte) (24 + permissionLevel);
}