From cd13d2f33c6ac0e8acb1844ae537ef6714d775d0 Mon Sep 17 00:00:00 2001
From: SerendipityR <48401197+SerendipityR-2022@users.noreply.github.com>
Date: Thu, 1 Feb 2024 17:48:39 +0000
Subject: [PATCH] =?UTF-8?q?Add:=20=E6=B7=BB=E5=8A=A0=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA=EF=BC=8C=E4=BE=BF=E4=BA=8E=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MultipleVersion/Bot/BotManager.java                   | 6 +++---
 .../MultipleVersion/Packet/PacketHandler.java             | 2 +-
 .../MultipleVersion/Packet/PacketManager.java             | 3 +++
 .../VersionSupport/P1_12_2/PacketHandler.java             | 8 ++++----
 .../VersionSupport/P1_13_X/PacketHandler.java             | 8 ++++----
 .../VersionSupport/P1_14_X/PacketHandler.java             | 8 ++++----
 .../VersionSupport/P1_15_X/PacketHandler.java             | 3 +--
 .../VersionSupport/P1_16_X/PacketHandler.java             | 2 +-
 .../VersionSupport/P1_17_X/PacketHandler.java             | 2 +-
 .../VersionSupport/P1_18_X/PacketHandler.java             | 2 +-
 .../VersionSupport/P1_19/PacketHandler.java               | 2 +-
 .../VersionSupport/P1_19_1_1_19_2/PacketHandler.java      | 2 +-
 .../VersionSupport/P1_19_3_1_20_1/PacketHandler.java      | 2 +-
 .../VersionSupport/P1_20_X/PacketHandler.java             | 2 +-
 .../VersionSupport/P1_7_X/PacketHandler.java              | 6 +++---
 .../VersionSupport/P1_8_X/PacketHandler.java              | 6 +++---
 .../VersionSupport/P1_9_X_1_12_1/PacketHandler.java       | 8 ++++----
 17 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Bot/BotManager.java b/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Bot/BotManager.java
index 41b74d5..98f9567 100644
--- a/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Bot/BotManager.java
+++ b/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Bot/BotManager.java
@@ -96,16 +96,16 @@ public class BotManager {
                     case "goToLobby":
                         if (protocolVersion > 498) {
                             LogUtil.doLog(0, "[" + userName + "] [DEBUG] [行动] 无法移动到NPC所处位置: 当前版本不支持。", "BotAttack");
-                            return;
+                            break;
                         }
 
                         Object npc = getNpc();
                         if (npc == null) {
-                            return;
+                            break;
                         }
                         Double[] npcLoc = packetHandler.getSpawnPlayerLocation(npc);
                         if (npcLoc == null) {
-                            return;
+                            break;
                         }
                         LogUtil.doLog(0, "[DEBUG] [行动] 尝试移动到NPC所处位置: " + Arrays.toString(npcLoc), "BotAttack");
                         moveToLocation(client, npcLoc);
diff --git a/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Packet/PacketHandler.java b/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Packet/PacketHandler.java
index 8a74c87..7167306 100644
--- a/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Packet/PacketHandler.java
+++ b/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Packet/PacketHandler.java
@@ -31,7 +31,7 @@ public interface PacketHandler {
 
     boolean checkSpawnPlayerName(Object packet, String checkName);
 
-    List<String> getSpawnPlayerMetadata(Object packet);
+    List<Object> getSpawnPlayerMetadata(Object packet);
 
     Double[] getSpawnPlayerLocation(Object packet);
 
diff --git a/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Packet/PacketManager.java b/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Packet/PacketManager.java
index 2b217ed..b0caf83 100644
--- a/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Packet/PacketManager.java
+++ b/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Packet/PacketManager.java
@@ -45,6 +45,9 @@ public class PacketManager {
         } else if (packetHandler.checkServerSpawnPlayerPacket(packet)) {
             // 其他玩家位置数据包
             boolean add = true;
+            if (ConfigUtil.AttackMethod.equals(5)) {
+                LogUtil.doLog(0, "[DEBUG] 接收到其他玩家位置: " + packetHandler.getSpawnPlayerMetadata(packet), "BotAttack");
+            }
             for (String checkName : ConfigUtil.JoinNPCDetect) {
                 if (!packetHandler.checkSpawnPlayerName(packet, checkName)) {
                     add = false;
diff --git a/VersionSupport-P1_12_2/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_12_2/PacketHandler.java b/VersionSupport-P1_12_2/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_12_2/PacketHandler.java
index d91aca8..e86ac09 100644
--- a/VersionSupport-P1_12_2/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_12_2/PacketHandler.java
+++ b/VersionSupport-P1_12_2/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_12_2/PacketHandler.java
@@ -197,11 +197,11 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
     }
 
     @Override
-    public List<String> getSpawnPlayerMetadata(Object packet) {
+    public List<Object> getSpawnPlayerMetadata(Object packet) {
         ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet;
-        List<String> metaData = new ArrayList<>();
-        for (EntityMetadata metadata:playerPacket.getMetadata()) {
-            metaData.add((String) metadata.getValue());
+        List<Object> metaData = new ArrayList<>();
+        for (EntityMetadata metadata : playerPacket.getMetadata()) {
+            metaData.add(metadata.getValue());
         }
         return metaData;
     }
diff --git a/VersionSupport-P1_13_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_13_X/PacketHandler.java b/VersionSupport-P1_13_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_13_X/PacketHandler.java
index ede703e..62ed0c3 100644
--- a/VersionSupport-P1_13_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_13_X/PacketHandler.java
+++ b/VersionSupport-P1_13_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_13_X/PacketHandler.java
@@ -193,11 +193,11 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
     }
 
     @Override
-    public List<String> getSpawnPlayerMetadata(Object packet) {
+    public List<Object> getSpawnPlayerMetadata(Object packet) {
         ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet;
-        List<String> metaData = new ArrayList<>();
-        for (EntityMetadata metadata:playerPacket.getMetadata()) {
-            metaData.add((String) metadata.getValue());
+        List<Object> metaData = new ArrayList<>();
+        for (EntityMetadata metadata : playerPacket.getMetadata()) {
+            metaData.add(metadata.getValue());
         }
         return metaData;
     }
diff --git a/VersionSupport-P1_14_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_14_X/PacketHandler.java b/VersionSupport-P1_14_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_14_X/PacketHandler.java
index d8b8882..ec7dea3 100644
--- a/VersionSupport-P1_14_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_14_X/PacketHandler.java
+++ b/VersionSupport-P1_14_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_14_X/PacketHandler.java
@@ -186,11 +186,11 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
     }
 
     @Override
-    public List<String> getSpawnPlayerMetadata(Object packet) {
+    public List<Object> getSpawnPlayerMetadata(Object packet) {
         ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet;
-        List<String> metaData = new ArrayList<>();
-        for (EntityMetadata metadata:playerPacket.getMetadata()) {
-            metaData.add((String) metadata.getValue());
+        List<Object> metaData = new ArrayList<>();
+        for (EntityMetadata metadata : playerPacket.getMetadata()) {
+            metaData.add(metadata.getValue());
         }
         return metaData;
     }
diff --git a/VersionSupport-P1_15_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_15_X/PacketHandler.java b/VersionSupport-P1_15_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_15_X/PacketHandler.java
index a16042b..f39c012 100644
--- a/VersionSupport-P1_15_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_15_X/PacketHandler.java
+++ b/VersionSupport-P1_15_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_15_X/PacketHandler.java
@@ -9,7 +9,6 @@ import cn.serendipityr.EndMinecraftPlusV2.Tools.ConfigUtil;
 import cn.serendipityr.EndMinecraftPlusV2.Tools.LogUtil;
 import cn.serendipityr.EndMinecraftPlusV2.Tools.OtherUtils;
 import com.github.steveice10.mc.protocol.data.game.ClientRequest;
-import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
 import com.github.steveice10.mc.protocol.data.game.entity.player.Hand;
 import com.github.steveice10.mc.protocol.data.game.entity.player.InteractAction;
@@ -176,7 +175,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
     }
 
     @Override
-    public List<String> getSpawnPlayerMetadata(Object packet) {
+    public List<Object> getSpawnPlayerMetadata(Object packet) {
         return null;
     }
 
diff --git a/VersionSupport-P1_16_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_16_X/PacketHandler.java b/VersionSupport-P1_16_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_16_X/PacketHandler.java
index d2ce2df..3c43869 100644
--- a/VersionSupport-P1_16_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_16_X/PacketHandler.java
+++ b/VersionSupport-P1_16_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_16_X/PacketHandler.java
@@ -171,7 +171,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
     }
 
     @Override
-    public List<String> getSpawnPlayerMetadata(Object packet) {
+    public List<Object> getSpawnPlayerMetadata(Object packet) {
         return null;
     }
 
diff --git a/VersionSupport-P1_17_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_17_X/PacketHandler.java b/VersionSupport-P1_17_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_17_X/PacketHandler.java
index 0a7f703..c78f49d 100644
--- a/VersionSupport-P1_17_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_17_X/PacketHandler.java
+++ b/VersionSupport-P1_17_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_17_X/PacketHandler.java
@@ -172,7 +172,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
     }
 
     @Override
-    public List<String> getSpawnPlayerMetadata(Object packet) {
+    public List<Object> getSpawnPlayerMetadata(Object packet) {
         return null;
     }
 
diff --git a/VersionSupport-P1_18_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_18_X/PacketHandler.java b/VersionSupport-P1_18_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_18_X/PacketHandler.java
index 65232d5..34d5f24 100644
--- a/VersionSupport-P1_18_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_18_X/PacketHandler.java
+++ b/VersionSupport-P1_18_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_18_X/PacketHandler.java
@@ -175,7 +175,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
     }
 
     @Override
-    public List<String> getSpawnPlayerMetadata(Object packet) {
+    public List<Object> getSpawnPlayerMetadata(Object packet) {
         return null;
     }
 
diff --git a/VersionSupport-P1_19/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19/PacketHandler.java b/VersionSupport-P1_19/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19/PacketHandler.java
index 2d6f493..90f41e0 100644
--- a/VersionSupport-P1_19/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19/PacketHandler.java
+++ b/VersionSupport-P1_19/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19/PacketHandler.java
@@ -175,7 +175,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
     }
 
     @Override
-    public List<String> getSpawnPlayerMetadata(Object packet) {
+    public List<Object> getSpawnPlayerMetadata(Object packet) {
         return null;
     }
 
diff --git a/VersionSupport-P1_19_1_1_19_2/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19_1_1_19_2/PacketHandler.java b/VersionSupport-P1_19_1_1_19_2/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19_1_1_19_2/PacketHandler.java
index 348b179..66c1df7 100644
--- a/VersionSupport-P1_19_1_1_19_2/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19_1_1_19_2/PacketHandler.java
+++ b/VersionSupport-P1_19_1_1_19_2/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19_1_1_19_2/PacketHandler.java
@@ -175,7 +175,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
     }
 
     @Override
-    public List<String> getSpawnPlayerMetadata(Object packet) {
+    public List<Object> getSpawnPlayerMetadata(Object packet) {
         return null;
     }
 
diff --git a/VersionSupport-P1_19_3_1_20_1/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19_3_1_20_1/PacketHandler.java b/VersionSupport-P1_19_3_1_20_1/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19_3_1_20_1/PacketHandler.java
index 7ce9c1c..6e1a386 100644
--- a/VersionSupport-P1_19_3_1_20_1/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19_3_1_20_1/PacketHandler.java
+++ b/VersionSupport-P1_19_3_1_20_1/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19_3_1_20_1/PacketHandler.java
@@ -175,7 +175,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
     }
 
     @Override
-    public List<String> getSpawnPlayerMetadata(Object packet) {
+    public List<Object> getSpawnPlayerMetadata(Object packet) {
         return null;
     }
 
diff --git a/VersionSupport-P1_20_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_20_X/PacketHandler.java b/VersionSupport-P1_20_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_20_X/PacketHandler.java
index acfc59d..9667a1a 100644
--- a/VersionSupport-P1_20_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_20_X/PacketHandler.java
+++ b/VersionSupport-P1_20_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_20_X/PacketHandler.java
@@ -182,7 +182,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
     }
 
     @Override
-    public List<String> getSpawnPlayerMetadata(Object packet) {
+    public List<Object> getSpawnPlayerMetadata(Object packet) {
         return null;
     }
 
diff --git a/VersionSupport-P1_7_X/VersionSupport-P1_7_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_7_X/PacketHandler.java b/VersionSupport-P1_7_X/VersionSupport-P1_7_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_7_X/PacketHandler.java
index 506c6da..a032d04 100644
--- a/VersionSupport-P1_7_X/VersionSupport-P1_7_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_7_X/PacketHandler.java
+++ b/VersionSupport-P1_7_X/VersionSupport-P1_7_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_7_X/PacketHandler.java
@@ -183,11 +183,11 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
     }
 
     @Override
-    public List<String> getSpawnPlayerMetadata(Object packet) {
+    public List<Object> getSpawnPlayerMetadata(Object packet) {
         ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet;
-        List<String> metaData = new ArrayList<>();
+        List<Object> metaData = new ArrayList<>();
         for (EntityMetadata metadata : playerPacket.getMetadata()) {
-            metaData.add((String) metadata.getValue());
+            metaData.add(metadata.getValue());
         }
         return metaData;
     }
diff --git a/VersionSupport-P1_8_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_8_X/PacketHandler.java b/VersionSupport-P1_8_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_8_X/PacketHandler.java
index e4a5926..8ada9a7 100644
--- a/VersionSupport-P1_8_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_8_X/PacketHandler.java
+++ b/VersionSupport-P1_8_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_8_X/PacketHandler.java
@@ -192,11 +192,11 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
     }
 
     @Override
-    public List<String> getSpawnPlayerMetadata(Object packet) {
+    public List<Object> getSpawnPlayerMetadata(Object packet) {
         ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet;
-        List<String> metaData = new ArrayList<>();
+        List<Object> metaData = new ArrayList<>();
         for (EntityMetadata metadata:playerPacket.getMetadata()) {
-            metaData.add((String) metadata.getValue());
+            metaData.add(metadata.getValue());
         }
         return metaData;
     }
diff --git a/VersionSupport-P1_9_X-1_12_1/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_9_X_1_12_1/PacketHandler.java b/VersionSupport-P1_9_X-1_12_1/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_9_X_1_12_1/PacketHandler.java
index 715c540..88f89c6 100644
--- a/VersionSupport-P1_9_X-1_12_1/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_9_X_1_12_1/PacketHandler.java
+++ b/VersionSupport-P1_9_X-1_12_1/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_9_X_1_12_1/PacketHandler.java
@@ -197,11 +197,11 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
     }
 
     @Override
-    public List<String> getSpawnPlayerMetadata(Object packet) {
+    public List<Object> getSpawnPlayerMetadata(Object packet) {
         ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet;
-        List<String> metaData = new ArrayList<>();
-        for (EntityMetadata metadata:playerPacket.getMetadata()) {
-            metaData.add((String) metadata.getValue());
+        List<Object> metaData = new ArrayList<>();
+        for (EntityMetadata metadata : playerPacket.getMetadata()) {
+            metaData.add(metadata.getValue());
         }
         return metaData;
     }