SteamWar/Velocity
13
0
Fork 0
geforkt von Mirrors/Velocity
Code Issues Pull-Requests Aktivität

Fix Adventure sendActionBar implementation and add proper action bar sending for 1.16.2

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Andrew Steinborn 2020-10-20 14:26:08 -04:00
Ursprung b78ffe6e86
Commit a6e708c98e
2 geänderte Dateien mit 11 neuen und 3 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

13
proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
Datei anzeigen

@ -281,11 +281,18 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
@Override @Override
public void sendActionBar(net.kyori.adventure.text.@NonNull Component message) { public void sendActionBar(net.kyori.adventure.text.@NonNull Component message) {
if (getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_11) >= 0) { ProtocolVersion playerVersion = getProtocolVersion();
if (playerVersion.compareTo(ProtocolVersion.MINECRAFT_1_16_2) >= 0) {
// We do not need to use the title packets in 1.16.2+
// https://bugs.mojang.com/browse/MC-119145
Chat chat = Chat.createClientbound(Identity.nil(), message, getProtocolVersion());
chat.setType(Chat.ACTION_TYPE);
connection.write(chat);
} else if (playerVersion.compareTo(ProtocolVersion.MINECRAFT_1_11) >= 0) {
// We can use the title packet instead. // We can use the title packet instead.
TitlePacket pkt = new TitlePacket(); TitlePacket pkt = new TitlePacket();
pkt.setAction(TitlePacket.SET_ACTION_BAR); pkt.setAction(TitlePacket.SET_ACTION_BAR);
pkt.setComponent(ProtocolUtils.getJsonChatSerializer(this.getProtocolVersion()) pkt.setComponent(ProtocolUtils.getJsonChatSerializer(playerVersion)
.serialize(message)); .serialize(message));
connection.write(pkt); connection.write(pkt);
} else { } else {
@ -295,7 +302,7 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
object.addProperty("text", LegacyComponentSerializer.legacySection().serialize(message)); object.addProperty("text", LegacyComponentSerializer.legacySection().serialize(message));
Chat chat = new Chat(); Chat chat = new Chat();
chat.setMessage(object.toString()); chat.setMessage(object.toString());
chat.setType((byte) 1); chat.setType(Chat.ACTION_TYPE);
connection.write(chat); connection.write(chat);
} }
} }

1
proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/Chat.java
Datei anzeigen

@ -15,6 +15,7 @@ public class Chat implements MinecraftPacket {
public static final byte CHAT_TYPE = (byte) 0; public static final byte CHAT_TYPE = (byte) 0;
public static final byte SYSTEM_TYPE = (byte) 1; public static final byte SYSTEM_TYPE = (byte) 1;
public static final byte ACTION_TYPE = (byte) 2;
public static final int MAX_SERVERBOUND_MESSAGE_LENGTH = 256; public static final int MAX_SERVERBOUND_MESSAGE_LENGTH = 256;
public static final UUID EMPTY_SENDER = new UUID(0, 0); public static final UUID EMPTY_SENDER = new UUID(0, 0);