Upstream
/
ProtocolLib
mirror of https://github.com/dmulloy2/ProtocolLib.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use correct packet for chat extensions on 1.19+ (#1824)

This commit is contained in:
Pasqual Koschmieder 2022-08-10 22:59:03 +02:00 committed by GitHub
parent 8876ce323b
commit 2be216899a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/comphenix/protocol/utility/ChatExtensions.java
View File

@ -17,15 +17,16 @@
package com.comphenix.protocol.utility;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.ProtocolManager;
import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.wrappers.EnumWrappers;
import com.comphenix.protocol.wrappers.WrappedChatComponent;
import com.google.common.base.Strings;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@ -56,15 +57,24 @@ public final class ChatExtensions {
List<PacketContainer> packets = new ArrayList<>();
WrappedChatComponent[] components = WrappedChatComponent.fromChatMessage(message);
for (WrappedChatComponent component : components) {
PacketContainer packet = new PacketContainer(PacketType.Play.Server.CHAT);
packet.getChatComponents().write(0, component);
PacketContainer packet;
if (MinecraftVersion.WILD_UPDATE.atOrAbove()) {
// since 1.19 system chat is extracted into a separate packet
packet = new PacketContainer(PacketType.Play.Server.SYSTEM_CHAT);
// 1.12+
packet.getChatTypes().writeSafely(0, EnumWrappers.ChatType.SYSTEM);
// 1.8-1.12
packet.getBytes().writeSafely(0, (byte) 1);
// 1.16+
packet.getUUIDs().writeSafely(0, SERVER_UUID);
packet.getStrings().write(0, component.getJson());
packet.getBooleans().write(0, false);
} else {
packet = new PacketContainer(PacketType.Play.Server.CHAT);
packet.getChatComponents().write(0, component);
// 1.12+
packet.getChatTypes().writeSafely(0, EnumWrappers.ChatType.SYSTEM);
// 1.8-1.12
packet.getBytes().writeSafely(0, (byte) 1);
// 1.16+
packet.getUUIDs().writeSafely(0, SERVER_UUID);
}
packets.add(packet);
}