helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-11-07 17:36:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjust some comments

Browse source
This commit is contained in:
BruceChen 2022-08-27 02:32:59 +08:00
parent 93c89f879d
commit 7ceb4807f3
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -475,7 +475,7 @@ namespace MinecraftClient.Protocol.Handlers
byte[] messageSignature = dataTypes.ReadNextByteArray(packetData); byte[] messageSignature = dataTypes.ReadNextByteArray(packetData);
bool verifyResult; bool verifyResult;
if (senderUUID.ToString().Replace("-", String.Empty) == handler.GetUserUuidStr()) if (senderUUID == handler.GetUserUuid())
verifyResult = true; verifyResult = true;
else else
{ {
@ -518,19 +518,19 @@ namespace MinecraftClient.Protocol.Handlers
string? targetName = dataTypes.ReadNextBool(packetData) ? dataTypes.ReadNextString(packetData) : null; string? targetName = dataTypes.ReadNextBool(packetData) ? dataTypes.ReadNextString(packetData) : null;
bool verifyResult; bool verifyResult;
if (senderUUID.ToString().Replace("-", String.Empty) == handler.GetUserUuidStr()) if (senderUUID == handler.GetUserUuid())
verifyResult = true; verifyResult = true;
else else
{ {
PlayerInfo? player = handler.GetPlayerInfo(senderUUID); PlayerInfo? player = handler.GetPlayerInfo(senderUUID);
if (player == null) if (player == null || !player.IsMessageChainLegal())
verifyResult = false; verifyResult = false;
else else
{ {
bool lastVerifyResult = player.IsMessageChainLegal(); bool lastVerifyResult = player.IsMessageChainLegal();
verifyResult = player.VerifyMessage(signedChat, timestamp, salt, ref headerSignature, ref precedingSignature, lastSeenMessages); verifyResult = player.VerifyMessage(signedChat, timestamp, salt, ref headerSignature, ref precedingSignature, lastSeenMessages);
if (lastVerifyResult && !verifyResult) if (lastVerifyResult && !verifyResult)
log.Warn("Player " + player.DisplayName + " message chains broken!"); log.Warn("Player " + player.DisplayName + "'s message chain is broken!");
} }
} }
@ -557,19 +557,19 @@ namespace MinecraftClient.Protocol.Handlers
byte[] bodyDigest = dataTypes.ReadNextByteArray(packetData); byte[] bodyDigest = dataTypes.ReadNextByteArray(packetData);
bool verifyResult; bool verifyResult;
if (senderUUID.ToString().Replace("-", String.Empty) == handler.GetUserUuidStr()) if (senderUUID == handler.GetUserUuid())
verifyResult = true; verifyResult = true;
else else
{ {
PlayerInfo? player = handler.GetPlayerInfo(senderUUID); PlayerInfo? player = handler.GetPlayerInfo(senderUUID);
if (player == null) if (player == null || !player.IsMessageChainLegal())
verifyResult = false; verifyResult = false;
else else
{ {
bool lastVerifyResult = player.IsMessageChainLegal(); bool lastVerifyResult = player.IsMessageChainLegal();
verifyResult = player.VerifyMessageHead(ref precedingSignature, ref headerSignature, ref bodyDigest); verifyResult = player.VerifyMessageHead(ref precedingSignature, ref headerSignature, ref bodyDigest);
if (lastVerifyResult && !verifyResult) if (lastVerifyResult && !verifyResult)
log.Warn("Player " + player.DisplayName + " message chains broken!"); log.Warn("Player " + player.DisplayName + "'s message chain is broken!");
} }
} }
} }

8
MinecraftClient/Protocol/Message/ChatParser.cs
View file

@ -107,7 +107,7 @@ namespace MinecraftClient.Protocol
if (message.isSystemChat) if (message.isSystemChat)
{ {
if (Settings.MarkSystemMessage) if (Settings.MarkSystemMessage)
color = "§z §r "; // Custom: Background Gray color = "§z §r "; // Custom color code §z : Background Gray
} }
else else
{ {
@ -116,18 +116,18 @@ namespace MinecraftClient.Protocol
if (Settings.ShowModifiedChat && message.unsignedContent != null) if (Settings.ShowModifiedChat && message.unsignedContent != null)
{ {
if (Settings.MarkModifiedMsg) if (Settings.MarkModifiedMsg)
color = "§x §r "; // Custom: Background Yellow color = "§x §r "; // Custom color code §x : Background Yellow
} }
else else
{ {
if (Settings.MarkLegallySignedMsg) if (Settings.MarkLegallySignedMsg)
color = "§y §r "; // Custom: Background Green color = "§y §r "; // Custom color code §y : Background Green
} }
} }
else else
{ {
if (Settings.MarkIllegallySignedMsg) if (Settings.MarkIllegallySignedMsg)
color = "§w §r "; // Custom: Background Red color = "§w §r "; // Custom color code §w : Background Red
} }
} }
return color + text; return color + text;