Revert broken chat PR and align with Spigot

HexagonMC · Jun 8, 2022 · ff5727c · ff5727c
1 parent e46bc34
commit ff5727c
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -479,7 +479,13 @@ private void sendMessage(ChatMessageType position, UUID sender, String message)
     {
         if ( getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_19 )
         {
-            unsafe().sendPacket( new SystemChat( message, position.ordinal() - 1 ) ); // For system messages, the CHAT position is not supported.
+            // Align with Spigot and remove client side formatting for now
+            if ( position == ChatMessageType.CHAT )
+            {
+                position = ChatMessageType.SYSTEM;
+            }
+
+            unsafe().sendPacket( new SystemChat( message, position.ordinal() ) );
         } else
         {
             unsafe().sendPacket( new Chat( message, (byte) position.ordinal(), sender ) );