merge upstream

This commit is contained in:
Ben Kerllenevich
2022-06-09 07:12:26 -04:00
parent 9ab5b07c78
commit 4b168c7792
41 changed files with 253 additions and 270 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable valid characters for usernames
diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
index 6ee6a35006a3d479ce916b3be297e3c1e38d7a8c..84a4853fe19817e6f95b16d563d819613ec45ac2 100644
index a62825d8f8c79ac15183b7b1eb9ba0c5e9a1fc6e..22b1836931e63a626ee12cb2b9c6db01daabf93e 100644
--- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
@@ -270,6 +270,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
@@ -269,6 +269,8 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
return false;
}