Fix: 未处理不支持的版本

VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Bot/BotManager.java

@@ -94,7 +94,15 @@ public class BotManager {
                         moveToLocation(client, loc);
                         break;
                     case "goToLobby":
+                        if (protocolVersion > 498) {
+                            LogUtil.doLog(0, "[" + userName + "] [DEBUG] [行动] 无法移动到NPC所处位置: 当前版本不支持。", "BotAttack");
+                            return;
+                        }
+
                         Object npc = getNpc();
+                        if (npc == null) {
+                            return;
+                        }
                         Double[] npcLoc = packetHandler.getSpawnPlayerLocation(npc);
                         if (npcLoc == null) {
                             return;
@@ -361,9 +369,18 @@ public class BotManager {
             case "goToLobby":
                 String[] lobbyArgs = _action[1].split("_");
                 String lobbyFlag = lobbyArgs[0];
+
+                if (protocolVersion > 498) {
+                    LogUtil.doLog(0, "[" + userName + "] [行动] 无法移动到NPC所处位置: 当前版本不支持。", "BotAttack");
+                    return;
+                }
+
                 if ("none".equals(lobbyFlag) || botHandler.hasClientFlag(client, lobbyFlag)) {
                     // 必须禁用默认处理方式
                     Object npc = getNpc();
+                    if (npc == null) {
+                        return;
+                    }
                     Double[] npcLoc = packetHandler.getSpawnPlayerLocation(npc);
                     if (npcLoc == null) {
                         return;

VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Packet/PacketHandler.java

@@ -28,8 +28,13 @@ public interface PacketHandler {
     void handleServerPlayerHealthPacket(Object client, Object packet, String username);
 
     boolean checkServerSpawnPlayerPacket(Object packet);
+
     boolean checkSpawnPlayerName(Object packet, String checkName);
+
+    List<String> getSpawnPlayerMetadata(Object packet);
+
     Double[] getSpawnPlayerLocation(Object packet);
+
     int getSpawnPlayerEntityId(Object packet);
 
     void moveToLocation(Object client, Double[] targetLocation, double moveSpeed);

VersionSupport-P1_12_2/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_12_2/PacketHandler.java

@@ -196,6 +196,16 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
         return false;
     }
 
+    @Override
+    public List<String> getSpawnPlayerMetadata(Object packet) {
+        ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet;
+        List<String> metaData = new ArrayList<>();
+        for (EntityMetadata metadata:playerPacket.getMetadata()) {
+            metaData.add((String) metadata.getValue());
+        }
+        return metaData;
+    }
+
     @Override
     public Double[] getSpawnPlayerLocation(Object packet) {
         ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet;

VersionSupport-P1_13_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_13_X/PacketHandler.java

@@ -192,6 +192,16 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
         return false;
     }
 
+    @Override
+    public List<String> getSpawnPlayerMetadata(Object packet) {
+        ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet;
+        List<String> metaData = new ArrayList<>();
+        for (EntityMetadata metadata:playerPacket.getMetadata()) {
+            metaData.add((String) metadata.getValue());
+        }
+        return metaData;
+    }
+
     @Override
     public Double[] getSpawnPlayerLocation(Object packet) {
         ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet;

VersionSupport-P1_14_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_14_X/PacketHandler.java

@@ -185,6 +185,16 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
         return false;
     }
 
+    @Override
+    public List<String> getSpawnPlayerMetadata(Object packet) {
+        ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet;
+        List<String> metaData = new ArrayList<>();
+        for (EntityMetadata metadata:playerPacket.getMetadata()) {
+            metaData.add((String) metadata.getValue());
+        }
+        return metaData;
+    }
+
     @Override
     public Double[] getSpawnPlayerLocation(Object packet) {
         ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet;

VersionSupport-P1_15_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_15_X/PacketHandler.java

@@ -9,6 +9,7 @@ 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;
@@ -174,6 +175,11 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
         return false;
     }
 
+    @Override
+    public List<String> getSpawnPlayerMetadata(Object packet) {
+        return null;
+    }
+
     @Override
     public Double[] getSpawnPlayerLocation(Object packet) {
         ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet;

VersionSupport-P1_16_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_16_X/PacketHandler.java

@@ -170,6 +170,11 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
         return false;
     }
 
+    @Override
+    public List<String> getSpawnPlayerMetadata(Object packet) {
+        return null;
+    }
+
     @Override
     public Double[] getSpawnPlayerLocation(Object packet) {
         ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet;

VersionSupport-P1_17_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_17_X/PacketHandler.java

@@ -171,6 +171,11 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
         return false;
     }
 
+    @Override
+    public List<String> getSpawnPlayerMetadata(Object packet) {
+        return null;
+    }
+
     @Override
     public Double[] getSpawnPlayerLocation(Object packet) {
         ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet;

VersionSupport-P1_18_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_18_X/PacketHandler.java

@@ -174,6 +174,11 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
         return false;
     }
 
+    @Override
+    public List<String> getSpawnPlayerMetadata(Object packet) {
+        return null;
+    }
+
     @Override
     public Double[] getSpawnPlayerLocation(Object packet) {
         ClientboundAddPlayerPacket playerPacket = (ClientboundAddPlayerPacket) packet;

VersionSupport-P1_19/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19/PacketHandler.java

@@ -174,6 +174,11 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
         return false;
     }
 
+    @Override
+    public List<String> getSpawnPlayerMetadata(Object packet) {
+        return null;
+    }
+
     @Override
     public Double[] getSpawnPlayerLocation(Object packet) {
         ClientboundAddPlayerPacket playerPacket = (ClientboundAddPlayerPacket) packet;

VersionSupport-P1_19_1_1_19_2/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19_1_1_19_2/PacketHandler.java

@@ -174,6 +174,11 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
         return false;
     }
 
+    @Override
+    public List<String> getSpawnPlayerMetadata(Object packet) {
+        return null;
+    }
+
     @Override
     public Double[] getSpawnPlayerLocation(Object packet) {
         ClientboundAddPlayerPacket playerPacket = (ClientboundAddPlayerPacket) packet;

VersionSupport-P1_19_3_1_20_1/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_19_3_1_20_1/PacketHandler.java

@@ -174,6 +174,11 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
         return false;
     }
 
+    @Override
+    public List<String> getSpawnPlayerMetadata(Object packet) {
+        return null;
+    }
+
     @Override
     public Double[] getSpawnPlayerLocation(Object packet) {
         ClientboundAddPlayerPacket playerPacket = (ClientboundAddPlayerPacket) packet;

VersionSupport-P1_20_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_20_X/PacketHandler.java

@@ -181,6 +181,11 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
         return false;
     }
 
+    @Override
+    public List<String> getSpawnPlayerMetadata(Object packet) {
+        return null;
+    }
+
     @Override
     public Double[] getSpawnPlayerLocation(Object packet) {
         ClientboundAddEntityPacket playerPacket = (ClientboundAddEntityPacket) packet;

VersionSupport-P1_7_X/VersionSupport-P1_7_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_7_X/PacketHandler.java

@@ -182,6 +182,16 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
         return false;
     }
 
+    @Override
+    public List<String> getSpawnPlayerMetadata(Object packet) {
+        ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet;
+        List<String> metaData = new ArrayList<>();
+        for (EntityMetadata metadata : playerPacket.getMetadata()) {
+            metaData.add((String) metadata.getValue());
+        }
+        return metaData;
+    }
+
     @Override
     public Double[] getSpawnPlayerLocation(Object packet) {
         ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet;

VersionSupport-P1_8_X/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_8_X/PacketHandler.java

@@ -191,6 +191,16 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
         return false;
     }
 
+    @Override
+    public List<String> getSpawnPlayerMetadata(Object packet) {
+        ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet;
+        List<String> metaData = new ArrayList<>();
+        for (EntityMetadata metadata:playerPacket.getMetadata()) {
+            metaData.add((String) metadata.getValue());
+        }
+        return metaData;
+    }
+
     @Override
     public Double[] getSpawnPlayerLocation(Object packet) {
         ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet;

VersionSupport-P1_9_X-1_12_1/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/VersionSupport/P1_9_X_1_12_1/PacketHandler.java

@@ -196,6 +196,16 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
         return false;
     }
 
+    @Override
+    public List<String> getSpawnPlayerMetadata(Object packet) {
+        ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet;
+        List<String> metaData = new ArrayList<>();
+        for (EntityMetadata metadata:playerPacket.getMetadata()) {
+            metaData.add((String) metadata.getValue());
+        }
+        return metaData;
+    }
+
     @Override
     public Double[] getSpawnPlayerLocation(Object packet) {
         ServerSpawnPlayerPacket playerPacket = (ServerSpawnPlayerPacket) packet;