helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improvements to the code of the Chat Message packet.

Browse source
This commit is contained in:
Milutinke 2022-12-21 13:04:41 +01:00
parent bb160d6d84
commit 20273af554
1 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -536,14 +536,13 @@ namespace MinecraftClient.Protocol.Handlers
// Previous Messages
int totalPreviousMessages = dataTypes.ReadNextVarInt(packetData);
List<Byte[]> previousMessageSignatures = new();
List<Tuple<int, byte[]>> previousMessageSignatures = new();
for (int i = 0; i < totalPreviousMessages; i++)
{
int messageId = dataTypes.ReadNextVarInt(packetData);
if (messageId > 0)
previousMessageSignatures.Add(dataTypes.ReadNextByteArray(packetData));
previousMessageSignatures.Add(new Tuple<int, byte[]>(messageId, dataTypes.ReadNextByteArray(packetData)));
}
// Other
@ -555,13 +554,30 @@ namespace MinecraftClient.Protocol.Handlers
dataTypes.ReadNextULongArray(packetData);
// Network Target
int chatType = dataTypes.ReadNextInt(packetData);
string networkName = dataTypes.ReadNextString(packetData);
bool networkTargetNamePresent = dataTypes.ReadNextBool(packetData);
string? networkTargetName = null;
int chatTypeId = dataTypes.ReadNextVarInt(packetData);
string chatName = dataTypes.ReadNextString(packetData);
string? targetName = dataTypes.ReadNextBool(packetData) ? dataTypes.ReadNextString(packetData) : null;
if (networkTargetNamePresent)
networkTargetName = dataTypes.ReadNextString(packetData);
Dictionary<string, Json.JSONData> chatInfo = Json.ParseJson(chatName).Properties;
string senderDisplayName = (chatInfo.ContainsKey("insertion") ? chatInfo["insertion"] : chatInfo["text"]).StringValue;
string? senderTeamName = null;
ChatParser.MessageType messageTypeEnum = ChatParser.ChatId2Type!.GetValueOrDefault(chatTypeId, ChatParser.MessageType.CHAT);
if (targetName != null &&
(messageTypeEnum == ChatParser.MessageType.TEAM_MSG_COMMAND_INCOMING || messageTypeEnum == ChatParser.MessageType.TEAM_MSG_COMMAND_OUTGOING))
senderTeamName = Json.ParseJson(targetName).Properties["with"].DataArray[0].Properties["text"].StringValue;
if (string.IsNullOrWhiteSpace(senderDisplayName))
{
PlayerInfo? player = handler.GetPlayerInfo(senderUUID);
if (player != null && (player.DisplayName != null || player.Name != null) && string.IsNullOrWhiteSpace(senderDisplayName))
{
senderDisplayName = ChatParser.ParseText(player.DisplayName ?? player.Name);
if (string.IsNullOrWhiteSpace(senderDisplayName))
senderDisplayName = player.DisplayName ?? player.Name;
else
senderDisplayName += "§r";
}
}
// TODO
}