Merge branch 'dev/3.0.0' of https://github.com/PaperMC/Velocity

GeyserMC · Nov 19, 2024 · 04e97d5 · 04e97d5
2 parents 33be16d + 9cfcfcf
commit 04e97d5
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/chat/SystemChatPacket.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/chat/SystemChatPacket.java
@@ -47,8 +47,11 @@ public ComponentHolder getComponent() {
   @Override
   public void decode(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
     component = ComponentHolder.read(buf, version);
-    // System chat is never decoded so this doesn't matter for now
-    type = ChatType.values()[ProtocolUtils.readVarInt(buf)];
+    if (version.noLessThan(ProtocolVersion.MINECRAFT_1_19_1)){
+      type = buf.readBoolean() ? ChatType.GAME_INFO : ChatType.SYSTEM;
+    } else {
+      type = ChatType.values()[ProtocolUtils.readVarInt(buf)];
+    }
   }
 
   @Override