From 0818de9d01affb8193eedf00c7c10f9b062c07ba Mon Sep 17 00:00:00 2001
From: SerendipityR <48401197+SerendipityR-2022@users.noreply.github.com>
Date: Thu, 6 Oct 2022 03:07:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NewVersion/AttackUtils/NewBotAttack.java             | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/cn/serendipityr/EndMinecraftPlusV2/VersionControl/NewVersion/AttackUtils/NewBotAttack.java b/src/cn/serendipityr/EndMinecraftPlusV2/VersionControl/NewVersion/AttackUtils/NewBotAttack.java
index 486a314..5030862 100644
--- a/src/cn/serendipityr/EndMinecraftPlusV2/VersionControl/NewVersion/AttackUtils/NewBotAttack.java
+++ b/src/cn/serendipityr/EndMinecraftPlusV2/VersionControl/NewVersion/AttackUtils/NewBotAttack.java
@@ -29,6 +29,7 @@ import com.github.steveice10.packetlib.event.session.*;
 import com.github.steveice10.packetlib.packet.Packet;
 import io.netty.util.internal.ConcurrentSet;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.ComponentSerializer;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 
@@ -368,7 +369,8 @@ public class NewBotAttack extends IAttack {
                         msg = e.getReason();
 
                         if (ProtocolLibs.adaptAfter754) {
-                            Component component = GsonComponentSerializer.gson().deserialize(msg);
+                            // Component component = GsonComponentSerializer.gson().deserialize(msg);
+                            Component component = PlainTextComponentSerializer.plainText().deserialize(msg);
                             msg = PlainTextComponentSerializer.plainText().serialize(component);
                         }
 
@@ -475,7 +477,6 @@ public class NewBotAttack extends IAttack {
 
         } else if (recvPacket instanceof ServerChatPacket) {
             ServerChatPacket chatPacket = (ServerChatPacket) recvPacket;
-            Message message = chatPacket.getMessage();
             Map<String, String> result = VersionSupport754.clickVerifiesHandle(chatPacket, session, ConfigUtil.ClickVerifiesDetect, null);
 
             if (result.get("result").contains("true")) {
@@ -491,8 +492,8 @@ public class NewBotAttack extends IAttack {
                 alivePlayers.add(username);
             }
 
-            if (ConfigUtil.ShowServerMessages && !message.getText().equals("")) {
-                LogUtil.doLog(0, "[服务端返回信息] [" + username + "] " + message.getFullText(), "BotAttack");
+            if (ConfigUtil.ShowServerMessages && !result.get("msg").equals("")) {
+                LogUtil.doLog(0, "[服务端返回信息] [" + username + "] " + result.get("msg"), "BotAttack");
             }
         } else if (recvPacket instanceof ServerKeepAlivePacket) {
             ClientKeepAlivePacket keepAlivePacket = new ClientKeepAlivePacket(((ServerKeepAlivePacket) recvPacket).getPingId());