Compare commits

..

7 Commits

Author SHA1 Message Date
yoyosource 4b8ceb5264 Fix UpdateTeamsPacket
SteamWarCI Build successful
2026-05-21 09:53:29 +02:00
yoyosource 2d1cade7bd Fix UpdateTeamsPacket
SteamWarCI Build successful
2026-05-21 09:19:40 +02:00
yoyosource 4067c44cd1 Fix UpdateTeamsPacket
SteamWarCI Build successful
2026-05-21 09:06:32 +02:00
yoyosource 45bb5de601 Fix Packet ID in 1.21.9 for UpdateTeamsPacket
SteamWarCI Build successful
2026-05-21 08:52:49 +02:00
yoyosource ebb9eb046d Fix UpdateTeamsPacket for 1.21.5+
SteamWarCI Build successful
2026-05-21 08:35:30 +02:00
Chaoscaot afc84b88ac Fix
SteamWarCI Build successful
2026-05-21 08:30:09 +02:00
Chaoscaot e6caa87865 Fix
SteamWarCI Build failed
2026-05-21 08:26:58 +02:00
3 changed files with 15 additions and 51 deletions
@@ -850,8 +850,8 @@ public enum StateRegistry {
map(0x5C, ProtocolVersion.MINECRAFT_1_20_2, true), map(0x5C, ProtocolVersion.MINECRAFT_1_20_2, true),
map(0x5E, ProtocolVersion.MINECRAFT_1_20_3, true), map(0x5E, ProtocolVersion.MINECRAFT_1_20_3, true),
map(0x60, ProtocolVersion.MINECRAFT_1_20_5, true), map(0x60, ProtocolVersion.MINECRAFT_1_20_5, true),
map(0x67, ProtocolVersion.MINECRAFT_1_21_2, true) map(0x67, ProtocolVersion.MINECRAFT_1_21_2, true),
map(0x87, MINECRAFT_1_21_9, false), map(0x6B, MINECRAFT_1_21_9, false),
map(0x89, MINECRAFT_26_1, false)); map(0x89, MINECRAFT_26_1, false));
} }
}, },
@@ -20,29 +20,27 @@
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;
import com.velocitypowered.proxy.protocol.packet.chat.ComponentHolder;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import java.util.List; import java.util.List;
public class UpdateTeamsPacket implements MinecraftPacket { public class UpdateTeamsPacket implements MinecraftPacket {
private String name; protected String name;
private Mode mode; protected Mode mode;
private Component displayName; protected Component displayName;
private Component prefix; protected Component prefix;
private Component suffix; protected Component suffix;
private NameTagVisibility nameTagVisibility; protected NameTagVisibility nameTagVisibility;
private CollisionRule collisionRule; protected CollisionRule collisionRule;
private int color; protected int color;
private byte friendlyFlags; protected byte friendlyFlags;
private List<String> players; protected List<String> players;
public UpdateTeamsPacket(String name, Mode mode, Component displayName, Component prefix, Component suffix, NameTagVisibility nameTagVisibility, CollisionRule collisionRule, int color, byte friendlyFlags, List<String> players) { public UpdateTeamsPacket(String name, Mode mode, Component displayName, Component prefix, Component suffix, NameTagVisibility nameTagVisibility, CollisionRule collisionRule, int color, byte friendlyFlags, List<String> players) {
this.name = name; this.name = name;
@@ -72,41 +70,7 @@ public class UpdateTeamsPacket implements MinecraftPacket {
@Override @Override
public void encode(ByteBuf byteBuf, ProtocolUtils.Direction direction, ProtocolVersion protocolVersion) { public void encode(ByteBuf byteBuf, ProtocolUtils.Direction direction, ProtocolVersion protocolVersion) {
ProtocolUtils.writeString(byteBuf, name); throw new UnsupportedOperationException("Packet is not implemented");
byteBuf.writeByte(mode.ordinal());
switch (mode) {
case CREATE, UPDATE:
new ComponentHolder(protocolVersion, displayName).write(byteBuf);
if (protocolVersion.lessThan(ProtocolVersion.MINECRAFT_1_13)) {
new ComponentHolder(protocolVersion, prefix).write(byteBuf);
new ComponentHolder(protocolVersion, suffix).write(byteBuf);
}
byteBuf.writeByte(friendlyFlags);
ProtocolUtils.writeString(byteBuf, nameTagVisibility.getValue());
ProtocolUtils.writeString(byteBuf, collisionRule.getValue());
if (protocolVersion.greaterThan(ProtocolVersion.MINECRAFT_1_12_2)) {
ProtocolUtils.writeVarInt(byteBuf, color);
new ComponentHolder(protocolVersion, prefix).write(byteBuf);
new ComponentHolder(protocolVersion, suffix).write(byteBuf);
} else {
byteBuf.writeByte((byte) color);
}
ProtocolUtils.writeVarInt(byteBuf, players.size());
for (String player : players) {
ProtocolUtils.writeString(byteBuf, player);
}
break;
case ADD_PLAYER, REMOVE_PLAYER:
ProtocolUtils.writeVarInt(byteBuf, players.size());
for (String player : players) {
ProtocolUtils.writeString(byteBuf, player);
}
break;
case REMOVE:
break;
}
} }
public enum Mode { public enum Mode {
+1 -1
View File
@@ -3,7 +3,7 @@ build:
artifacts: artifacts:
"/jars/Velocity.jar": "proxy/build/libs/velocity-proxy-3.4.0-SNAPSHOT-all.jar" "/jars/Velocity.jar": "proxy/build/libs/velocity-proxy-3.5.0-SNAPSHOT-all.jar"
release: release:
- "mvn deploy:deploy-file -DgroupId=de.steamwar -DartifactId=velocity -Dversion=RELEASE -Dpackaging=jar -Dfile=/jars/Velocity.jar -Durl=file:///var/www/maven/" - "mvn deploy:deploy-file -DgroupId=de.steamwar -DartifactId=velocity -Dversion=RELEASE -Dpackaging=jar -Dfile=/jars/Velocity.jar -Durl=file:///var/www/maven/"