SteamWar/Velocity
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix UpdateTeamsPacket for 1.21.5+
SteamWarCI Build successful
Details

Browse Source
This commit is contained in:
yoyosource
2026-05-21 08:35:30 +02:00
parent afc84b88ac
commit ebb9eb046d
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/UpdateTeamsPacket.java
+10 -3
View File
@@ -20,7 +20,6 @@
package com.velocitypowered.proxy.protocol.packet; package com.velocitypowered.proxy.protocol.packet;
import com.velocitypowered.api.network.ProtocolVersion; import com.velocitypowered.api.network.ProtocolVersion;
import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.proxy.connection.MinecraftSessionHandler; import com.velocitypowered.proxy.connection.MinecraftSessionHandler;
import com.velocitypowered.proxy.protocol.MinecraftPacket; import com.velocitypowered.proxy.protocol.MinecraftPacket;
import com.velocitypowered.proxy.protocol.ProtocolUtils; import com.velocitypowered.proxy.protocol.ProtocolUtils;
@@ -75,6 +74,8 @@ public class UpdateTeamsPacket implements MinecraftPacket {
ProtocolUtils.writeString(byteBuf, name); ProtocolUtils.writeString(byteBuf, name);
byteBuf.writeByte(mode.ordinal()); byteBuf.writeByte(mode.ordinal());
ProtocolUtils.writeString(byteBuf, name);
byteBuf.writeByte(mode.ordinal());
switch (mode) { switch (mode) {
case CREATE, UPDATE: case CREATE, UPDATE:
new ComponentHolder(protocolVersion, displayName).write(byteBuf); new ComponentHolder(protocolVersion, displayName).write(byteBuf);
@@ -82,9 +83,15 @@ public class UpdateTeamsPacket implements MinecraftPacket {
new ComponentHolder(protocolVersion, prefix).write(byteBuf); new ComponentHolder(protocolVersion, prefix).write(byteBuf);
new ComponentHolder(protocolVersion, suffix).write(byteBuf); new ComponentHolder(protocolVersion, suffix).write(byteBuf);
} }
byteBuf.writeByte(friendlyFlags); byteBuf.writeByte(friendlyFlags);
ProtocolUtils.writeString(byteBuf, nameTagVisibility.getValue()); if (protocolVersion.noLessThan(ProtocolVersion.MINECRAFT_1_21_5)) {
ProtocolUtils.writeString(byteBuf, collisionRule.getValue()); ProtocolUtils.writeVarInt(byteBuf, nameTagVisibility.ordinal());
ProtocolUtils.writeVarInt(byteBuf, collisionRule.ordinal());
} else {
ProtocolUtils.writeString(byteBuf, nameTagVisibility.getValue());
ProtocolUtils.writeString(byteBuf, collisionRule.getValue());
}
if (protocolVersion.greaterThan(ProtocolVersion.MINECRAFT_1_12_2)) { if (protocolVersion.greaterThan(ProtocolVersion.MINECRAFT_1_12_2)) {
ProtocolUtils.writeVarInt(byteBuf, color); ProtocolUtils.writeVarInt(byteBuf, color);
new ComponentHolder(protocolVersion, prefix).write(byteBuf); new ComponentHolder(protocolVersion, prefix).write(byteBuf);