From ff5727c5ef9c0b56ad35f9816ae6bd660b622cf0 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 8 Jun 2022 19:37:15 +1000
Subject: [PATCH] Revert broken chat PR and align with Spigot

---
 proxy/src/main/java/net/md_5/bungee/UserConnection.java | 8 +++++++-
 1 file changed, 7 insertions(+), 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
index 5a003148..274292d5 100644
--- 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 @@ public final class UserConnection implements ProxiedPlayer
     {
         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 ) );