From 7ceb4807f3d813252d153d1df386b1c435850b06 Mon Sep 17 00:00:00 2001
From: BruceChen <MrChen131217@gmail.com>
Date: Sat, 27 Aug 2022 02:32:59 +0800
Subject: [PATCH] Adjust some comments

---
 MinecraftClient/Protocol/Handlers/Protocol18.cs | 14 +++++++-------
 MinecraftClient/Protocol/Message/ChatParser.cs  |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/MinecraftClient/Protocol/Handlers/Protocol18.cs b/MinecraftClient/Protocol/Handlers/Protocol18.cs
index 64bdec30..2da4394e 100644
--- a/MinecraftClient/Protocol/Handlers/Protocol18.cs
+++ b/MinecraftClient/Protocol/Handlers/Protocol18.cs
@@ -475,7 +475,7 @@ namespace MinecraftClient.Protocol.Handlers
                                 byte[] messageSignature = dataTypes.ReadNextByteArray(packetData);
 
                                 bool verifyResult;
-                                if (senderUUID.ToString().Replace("-", String.Empty) == handler.GetUserUuidStr())
+                                if (senderUUID == handler.GetUserUuid())
                                     verifyResult = true;
                                 else
                                 {
@@ -518,19 +518,19 @@ namespace MinecraftClient.Protocol.Handlers
                                 string? targetName = dataTypes.ReadNextBool(packetData) ? dataTypes.ReadNextString(packetData) : null;
 
                                 bool verifyResult;
-                                if (senderUUID.ToString().Replace("-", String.Empty) == handler.GetUserUuidStr())
+                                if (senderUUID == handler.GetUserUuid())
                                     verifyResult = true;
                                 else
                                 {
                                     PlayerInfo? player = handler.GetPlayerInfo(senderUUID);
-                                    if (player == null)
+                                    if (player == null || !player.IsMessageChainLegal())
                                         verifyResult = false;
                                     else
                                     {
                                         bool lastVerifyResult = player.IsMessageChainLegal();
                                         verifyResult = player.VerifyMessage(signedChat, timestamp, salt, ref headerSignature, ref precedingSignature, lastSeenMessages);
                                         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);
 
                                 bool verifyResult;
-                                if (senderUUID.ToString().Replace("-", String.Empty) == handler.GetUserUuidStr())
+                                if (senderUUID == handler.GetUserUuid())
                                     verifyResult = true;
                                 else
                                 {
                                     PlayerInfo? player = handler.GetPlayerInfo(senderUUID);
-                                    if (player == null)
+                                    if (player == null || !player.IsMessageChainLegal())
                                         verifyResult = false;
                                     else
                                     {
                                         bool lastVerifyResult = player.IsMessageChainLegal();
                                         verifyResult = player.VerifyMessageHead(ref precedingSignature, ref headerSignature, ref bodyDigest);
                                         if (lastVerifyResult && !verifyResult)
-                                            log.Warn("Player " + player.DisplayName + " message chains broken!");
+                                            log.Warn("Player " + player.DisplayName + "'s message chain is broken!");
                                     }
                                 }
                             }
diff --git a/MinecraftClient/Protocol/Message/ChatParser.cs b/MinecraftClient/Protocol/Message/ChatParser.cs
index 7f817d25..ff36ca13 100644
--- a/MinecraftClient/Protocol/Message/ChatParser.cs
+++ b/MinecraftClient/Protocol/Message/ChatParser.cs
@@ -107,7 +107,7 @@ namespace MinecraftClient.Protocol
             if (message.isSystemChat)
             {
                 if (Settings.MarkSystemMessage)
-                    color = "§z §r ";     // Custom: Background Gray
+                    color = "§z §r ";     // Custom color code §z : Background Gray
             }
             else
             {
@@ -116,18 +116,18 @@ namespace MinecraftClient.Protocol
                     if (Settings.ShowModifiedChat && message.unsignedContent != null)
                     {
                         if (Settings.MarkModifiedMsg)
-                            color = "§x §r "; // Custom: Background Yellow
+                            color = "§x §r "; // Custom color code §x : Background Yellow
                     }
                     else
                     {
                         if (Settings.MarkLegallySignedMsg)
-                            color = "§y §r "; // Custom: Background Green
+                            color = "§y §r "; // Custom color code §y : Background Green
                     }
                 }
                 else
                 {
                     if (Settings.MarkIllegallySignedMsg)
-                        color = "§w §r "; // Custom: Background Red
+                        color = "§w §r "; // Custom color code §w : Background Red
                 }
             }
             return color + text;