helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2026-08-15 13:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

bugfix: Fixed teams packet for 1.8 - 1.12.3 + Added text formatting for names in the tab list

Browse source
This commit is contained in:
Anon 2026-04-04 22:27:34 +02:00 • committed by GitHub
commit 0cc34e6e22
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 66 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

106
MinecraftClient/Protocol/Handlers/Protocol18.cs
View file

@ -2190,7 +2190,7 @@ namespace MinecraftClient.Protocol.Handlers
string? displayName = null; string? displayName = null;
if (dataTypes.ReadNextBool(packetData)) // Has display name if (dataTypes.ReadNextBool(packetData)) // Has display name
displayName = dataTypes.ReadNextString(packetData); // Display name displayName = ChatParser.ParseText(dataTypes.ReadNextString(packetData)); // Display name
// 1.19 Additions // 1.19 Additions
long? keyExpiration = null; long? keyExpiration = null;
@ -2231,7 +2231,7 @@ namespace MinecraftClient.Protocol.Handlers
{ {
var player = handler.GetPlayerInfo(uuid); var player = handler.GetPlayerInfo(uuid);
if (player is not null) if (player is not null)
player.DisplayName = dataTypes.ReadNextString(packetData); player.DisplayName = ChatParser.ParseText(dataTypes.ReadNextString(packetData));
else else
dataTypes.SkipNextString(packetData); dataTypes.SkipNextString(packetData);
} }
@ -3045,12 +3045,22 @@ namespace MinecraftClient.Protocol.Handlers
case PacketTypesIn.Teams: case PacketTypesIn.Teams:
// Wire format per version: // Wire format per version:
// All versions: name (string), method (byte) // All versions: name (string), method (byte)
// method 0/2: displayName (component), options (byte), // 1.8/1.8.9 method 0/2:
// displayName (string), prefix (string), suffix (string),
// options (byte), nameTagVisibility, color (byte)
// 1.9-1.12.2 method 0/2:
// displayName (string), prefix (string), suffix (string),
// options (byte), nameTagVisibility, collisionRule,
// color (byte)
// 1.13-1.21.4 method 0/2:
// displayName (component), options (byte),
// nameTagVisibility, collisionRule, color (VarInt), // nameTagVisibility, collisionRule, color (VarInt),
// prefix (component), suffix (component) // prefix (component), suffix (component)
// 1.21.5+ method 0/2:
// displayName (component), options (byte),
// nameTagVisibility (VarInt), collisionRule (VarInt),
// color (VarInt), prefix (component), suffix (component)
// method 0/3/4: players list (VarInt count + strings) // method 0/3/4: players list (VarInt count + strings)
// 1.21.5+ (protocol 770): nameTagVisibility and collisionRule are
// VarInt-encoded enum IDs instead of UTF strings.
var teamName = dataTypes.ReadNextString(packetData); var teamName = dataTypes.ReadNextString(packetData);
var teamMethod = dataTypes.ReadNextByte(packetData); var teamMethod = dataTypes.ReadNextByte(packetData);
@ -3064,48 +3074,64 @@ namespace MinecraftClient.Protocol.Handlers
if (teamMethod is 0 or 2) if (teamMethod is 0 or 2)
{ {
teamDisplayName = dataTypes.ReadNextChat(packetData); if (protocolVersion < MC_1_13_Version)
teamFriendlyFlags = dataTypes.ReadNextByte(packetData);
// nameTagVisibility
if (protocolVersion >= MC_1_21_5_Version)
{
// STREAM_CODEC: 0=always, 1=never, 2=hideForOtherTeams, 3=hideForOwnTeam
teamNameTagVisibility = dataTypes.ReadNextVarInt(packetData) switch
{
0 => "always",
1 => "never",
2 => "hideForOtherTeams",
3 => "hideForOwnTeam",
_ => "always"
};
}
else
{ {
teamDisplayName = dataTypes.ReadNextString(packetData);
teamPrefix = dataTypes.ReadNextString(packetData);
teamSuffix = dataTypes.ReadNextString(packetData);
teamFriendlyFlags = dataTypes.ReadNextByte(packetData);
teamNameTagVisibility = dataTypes.ReadNextString(packetData); teamNameTagVisibility = dataTypes.ReadNextString(packetData);
}
// collisionRule if (protocolVersion >= MC_1_9_Version)
if (protocolVersion >= MC_1_21_5_Version) teamCollisionRule = dataTypes.ReadNextString(packetData);
{
// STREAM_CODEC: 0=always, 1=never, 2=pushOtherTeams, 3=pushOwnTeam teamColor = unchecked((sbyte)dataTypes.ReadNextByte(packetData));
teamCollisionRule = dataTypes.ReadNextVarInt(packetData) switch
{
0 => "always",
1 => "never",
2 => "pushOtherTeams",
3 => "pushOwnTeam",
_ => "always"
};
} }
else else
{ {
teamCollisionRule = dataTypes.ReadNextString(packetData); teamDisplayName = dataTypes.ReadNextChat(packetData);
} teamFriendlyFlags = dataTypes.ReadNextByte(packetData);
teamColor = dataTypes.ReadNextVarInt(packetData); // nameTagVisibility
teamPrefix = dataTypes.ReadNextChat(packetData); if (protocolVersion >= MC_1_21_5_Version)
teamSuffix = dataTypes.ReadNextChat(packetData); {
// STREAM_CODEC: 0=always, 1=never, 2=hideForOtherTeams, 3=hideForOwnTeam
teamNameTagVisibility = dataTypes.ReadNextVarInt(packetData) switch
{
0 => "always",
1 => "never",
2 => "hideForOtherTeams",
3 => "hideForOwnTeam",
_ => "always"
};
}
else
{
teamNameTagVisibility = dataTypes.ReadNextString(packetData);
}
// collisionRule
if (protocolVersion >= MC_1_21_5_Version)
{
// STREAM_CODEC: 0=always, 1=never, 2=pushOtherTeams, 3=pushOwnTeam
teamCollisionRule = dataTypes.ReadNextVarInt(packetData) switch
{
0 => "always",
1 => "never",
2 => "pushOtherTeams",
3 => "pushOwnTeam",
_ => "always"
};
}
else
{
teamCollisionRule = dataTypes.ReadNextString(packetData);
}
teamColor = dataTypes.ReadNextVarInt(packetData);
teamPrefix = dataTypes.ReadNextChat(packetData);
teamSuffix = dataTypes.ReadNextChat(packetData);
}
} }
var teamPlayers = new List<string>(); var teamPlayers = new List<string>();