Fix: 修复位置数据处理导致循环，优化部分逻辑。

2024-09-19 15:23:26 +00:00 · 2024-01-31 16:09:01 +08:00 · 2024-01-31 16:09:01 +08:00 · e6c636ae98
commit e6c636ae98
parent 74ba959588
20 changed files with 66 additions and 82 deletions
--- a/Main/src/cn/serendipityr/EndMinecraftPlusV2/AttackManager/AttackManager.java
+++ b/Main/src/cn/serendipityr/EndMinecraftPlusV2/AttackManager/AttackManager.java
@ -20,6 +20,9 @@ public class AttackManager {
            case 1:
            case 4:
            case 5:
+                LogUtil.doLog(0, "正在载入Minecraft协议库...", "ProtocolLib");
+                ProtocolLibs.loadProtocolLib();
+
                // BotDebug & BotAttack
                BotHandler botHandler;
                PacketHandler packetHandler;
--- a/Main/src/cn/serendipityr/EndMinecraftPlusV2/AttackManager/MotdAttack.java
+++ b/Main/src/cn/serendipityr/EndMinecraftPlusV2/AttackManager/MotdAttack.java
@ -75,6 +75,8 @@ public class MotdAttack {
                Proxy proxy = hasProxy ? UniverseMethods.getProxy(UniverseMethods.getProxyType(ConfigUtil.ProxyType)) : Proxy.NO_PROXY;
                Socket socket = new Socket(proxy);

+                LogUtil.doLog(0, "", "DEBUG");
+
                // 连接到服务器
                socket.connect(new InetSocketAddress(ConfigUtil.AttackAddress, ConfigUtil.AttackPort));
                try (OutputStream out = socket.getOutputStream();
--- a/Main/src/cn/serendipityr/EndMinecraftPlusV2/EndMinecraftPlusV2.java
+++ b/Main/src/cn/serendipityr/EndMinecraftPlusV2/EndMinecraftPlusV2.java
@ -8,8 +8,8 @@ import cn.serendipityr.EndMinecraftPlusV2.AttackManager.AttackManager;
 import cn.serendipityr.EndMinecraftPlusV2.VersionManager.ProtocolLibs;

 public class EndMinecraftPlusV2 {
-    public static String ver = "2.0.2";
-    public static Integer CfgVer = 9;
+    public static String ver = "2.0.3";
+    public static Integer CfgVer = 10;

    public static void main(String[] args) {
        System.out.println("=======================-Designed by SerendipityR-=======================");
@ -46,8 +46,6 @@ public class EndMinecraftPlusV2 {
    }

    public static void startAttack() {
-        LogUtil.doLog(0, "正在载入Minecraft协议库...", "ProtocolLib");
-        ProtocolLibs.loadProtocolLib();
        AttackManager.doAttack();
    }

--- a/Main/src/config.yml
+++ b/Main/src/config.yml
@ -3,7 +3,7 @@
 #   Designed by SerendipityR  #
 ###############################

-CfgVer: 9
+CfgVer: 10

 AttackSettings:
  Address: "example.com"
@ -14,6 +14,7 @@ AttackSettings:
  # 3 - MotdAttackP - MOTD压测(代理)
  # 4 - DoubleAttack - 影分身攻击(代理，仅原版单服可用)
  # 5 - BotDebug - 假人调试模式(无代理)
+  # [!] 请注意，无代理状态下，你的IP地址将暴露于攻击目标的后台日志中，请合理使用。
  Method: 1
  Time: 3600
  ConnectDelay: 15
@ -37,15 +38,15 @@ AttackSettings:
    # register&Login - 执行注册/登录:<密码>
    # crashPacket - 发送崩服数据包:<数量>
    Actions:
+      - "wait:2000"
+      - "register&Login:genshinImpact"
      - "wait:1000"
      - "chat:原神，启动!"
-      - "randomTeleport:1"
-      - "wait:1000"
-      - "backTeleport"
-      - "register&Login:genshinImpact"
-      - "crashPacket:20"
-      - "wait:1000"
-      - "crashPacket:20"
+      #- "randomTeleport:1"
+      #- "wait:1000"
+      #- "backTeleport"
+      #- "wait:1000"
+      #- "crashPacket:20"
  ShowFails: false

 AdvancedSettings:
@ -96,9 +97,15 @@ BotSettings:
  RandomFlag: 1
  RandomMinLength: 6
  RandomMaxLength: 8
-  # 是否回复KeepAlive数据包
-  # 如果你发现假人断开连接的原因与"Timeout"相关，请尝试切换此项。
-  KeepAlive: false
+  # 在此处控制数据包响应单元
+  PacketHandler:
+    # 是否回复KeepAlive数据包
+    # 如果你发现假人断开连接的原因与"Timeout"相关，请尝试切换此项。
+    KeepAlive: false
+    # 是否响应服务器位置数据包
+    # 如果你发现假人断开连接的原因与"位置异常"相关，请尝试切换此项。
+    Move: ture
+
  # 重新加入前模拟刷新服务器列表
  GetMotdBeforeRejoin: true
  GetMotdCount: 5
--- a/Tools/src/cn/serendipityr/EndMinecraftPlusV2/Tools/ConfigUtil.java
+++ b/Tools/src/cn/serendipityr/EndMinecraftPlusV2/Tools/ConfigUtil.java
@ -39,6 +39,7 @@ public class ConfigUtil {
    public static Integer RandomMinLength;
    public static Integer RandomMaxLength;
    public static Boolean KeepAlive;
+    public static Boolean PacketHandlerMove;
    public static Integer BotCount;
    public static List<String> RegisterCommands;
    public static Boolean GetMotdBeforeRejoin;
@ -101,7 +102,8 @@ public class ConfigUtil {
            RandomFlag = config.getInt("BotSettings.RandomFlag");
            RandomMinLength = config.getInt("BotSettings.RandomMinLength");
            RandomMaxLength = config.getInt("BotSettings.RandomMaxLength");
-            KeepAlive = config.getBoolean("BotSettings.KeepAlive");
+            KeepAlive = config.getBoolean("BotSettings.PacketHandler.KeepAlive");
+            PacketHandlerMove = config.getBoolean("BotSettings.PacketHandler.Move");
            RegisterCommands = config.getStringList("BotSettings.RegisterCommands");
            GetMotdBeforeRejoin = config.getBoolean("BotSettings.GetMotdBeforeRejoin");
            GetMotdCount = config.getInt("BotSettings.GetMotdCount");
--- a/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Packet/PacketManager.java
+++ b/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Packet/PacketManager.java
@ -20,7 +20,9 @@ public class PacketManager {
            packetHandler.handleServerJoinGamePacket(client, packet, username);
        } else if (packetHandler.checkServerKeepAlivePacket(packet)) {
            // 心跳包
-            packetHandler.handleServerKeepAlivePacket(client, packet, username);
+            if (ConfigUtil.KeepAlive) {
+                packetHandler.handleServerKeepAlivePacket(client, packet, username);
+            }
        } else if (packetHandler.checkServerChatPacket(packet)) {
            // 聊天信息包
            packetHandler.handleServerChatPacket(client, packet, username);
@ -32,7 +34,9 @@ public class PacketManager {
            packetHandler.handleServerPlayerHealthPacket(client, packet, username);
        } else if (packetHandler.checkServerPlayerPositionRotationPacket(packet)) {
            // 移动数据包
-            packetHandler.handleServerPlayerPositionRotationPacket(client, packet, username);
+            if (ConfigUtil.PacketHandlerMove) {
+                packetHandler.handleServerPlayerPositionRotationPacket(client, packet, username);
+            }
            BotManager.positionList.put(client, packet);
        } else {
            // packetHandler.handleOtherPacket(packet);
--- 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
@ -115,7 +115,6 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
        ServerPlayerPositionRotationPacket packet = (ServerPlayerPositionRotationPacket) recvPacket;
        ClientTeleportConfirmPacket teleportConfirmPacket = new ClientTeleportConfirmPacket(packet.getTeleportId());
        session.send(teleportConfirmPacket);
-        sendPositionRotationPacket(session, packet.getX(), packet.getY(), packet.getZ(), packet.getYaw(), packet.getYaw());
        sendClientPlayerMovementPacket(session, true);
    }

@ -142,9 +141,8 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
    public void handleServerKeepAlivePacket(Object client, Object recvPacket, String username) {
        Session session = ((Client) client).getSession();
        ServerKeepAlivePacket serverKeepAlivePacket = (ServerKeepAlivePacket) recvPacket;
-        if (ConfigUtil.KeepAlive) {
-            sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
-        }    }
+        sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
+    }

    @Override
    public boolean checkServerPlayerHealthPacket(Object packet) {
--- 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
@ -105,7 +105,6 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
        ServerPlayerPositionRotationPacket packet = (ServerPlayerPositionRotationPacket) recvPacket;
        ClientTeleportConfirmPacket teleportConfirmPacket = new ClientTeleportConfirmPacket(packet.getTeleportId());
        session.send(teleportConfirmPacket);
-        sendPositionRotationPacket(session, packet.getX(), packet.getY(), packet.getZ(), packet.getYaw(), packet.getYaw());
        sendClientPlayerMovementPacket(session, true);
    }

@ -132,9 +131,8 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
    public void handleServerKeepAlivePacket(Object client, Object recvPacket, String username) {
        Session session = ((Client) client).getSession();
        ServerKeepAlivePacket serverKeepAlivePacket = (ServerKeepAlivePacket) recvPacket;
-        if (ConfigUtil.KeepAlive) {
-            sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
-        }    }
+        sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
+    }

    @Override
    public boolean checkServerPlayerHealthPacket(Object packet) {
--- 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
@ -98,7 +98,6 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
        ServerPlayerPositionRotationPacket packet = (ServerPlayerPositionRotationPacket) recvPacket;
        ClientTeleportConfirmPacket teleportConfirmPacket = new ClientTeleportConfirmPacket(packet.getTeleportId());
        session.send(teleportConfirmPacket);
-        sendPositionRotationPacket(session, packet.getX(), packet.getY(), packet.getZ(), packet.getYaw(), packet.getYaw());
        sendClientPlayerMovementPacket(session, true);
    }

@ -125,9 +124,8 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
    public void handleServerKeepAlivePacket(Object client, Object recvPacket, String username) {
        Session session = ((Client) client).getSession();
        ServerKeepAlivePacket serverKeepAlivePacket = (ServerKeepAlivePacket) recvPacket;
-        if (ConfigUtil.KeepAlive) {
-            sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
-        }    }
+        sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
+    }

    @Override
    public boolean checkServerPlayerHealthPacket(Object packet) {
--- 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
@ -99,7 +99,6 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
        ServerPlayerPositionRotationPacket packet = (ServerPlayerPositionRotationPacket) recvPacket;
        ClientTeleportConfirmPacket teleportConfirmPacket = new ClientTeleportConfirmPacket(packet.getTeleportId());
        session.send(teleportConfirmPacket);
-        sendPositionRotationPacket(session, packet.getX(), packet.getY(), packet.getZ(), packet.getYaw(), packet.getYaw());
        sendClientPlayerMovementPacket(session, true);
    }

@ -126,9 +125,8 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
    public void handleServerKeepAlivePacket(Object client, Object recvPacket, String username) {
        Session session = ((Client) client).getSession();
        ServerKeepAlivePacket serverKeepAlivePacket = (ServerKeepAlivePacket) recvPacket;
-        if (ConfigUtil.KeepAlive) {
-            sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
-        }    }
+        sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
+    }

    @Override
    public boolean checkServerPlayerHealthPacket(Object packet) {
--- 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
@ -99,7 +99,6 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
        ServerPlayerPositionRotationPacket packet = (ServerPlayerPositionRotationPacket) recvPacket;
        ClientTeleportConfirmPacket teleportConfirmPacket = new ClientTeleportConfirmPacket(packet.getTeleportId());
        session.send(teleportConfirmPacket);
-        sendPositionRotationPacket(session, packet.getX(), packet.getY(), packet.getZ(), packet.getYaw(), packet.getYaw());
        sendClientPlayerMovementPacket(session, true);
    }

@ -126,9 +125,8 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
    public void handleServerKeepAlivePacket(Object client, Object recvPacket, String username) {
        Session session = ((Client) client).getSession();
        ServerKeepAlivePacket serverKeepAlivePacket = (ServerKeepAlivePacket) recvPacket;
-        if (ConfigUtil.KeepAlive) {
-            sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
-        }    }
+        sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
+    }

    @Override
    public boolean checkServerPlayerHealthPacket(Object packet) {
--- 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
@ -99,8 +99,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
        TcpClientSession session = (TcpClientSession) client;
        ServerPlayerPositionRotationPacket packet = (ServerPlayerPositionRotationPacket) recvPacket;
        ClientTeleportConfirmPacket teleportConfirmPacket = new ClientTeleportConfirmPacket(packet.getTeleportId());
-        ((TcpClientSession) client).send(teleportConfirmPacket);
-        sendPositionRotationPacket(session, packet.getX(), packet.getY(), packet.getZ(), packet.getYaw(), packet.getYaw());
+        session.send(teleportConfirmPacket);
        sendClientPlayerMovementPacket(session, true);
    }

@ -127,9 +126,8 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
    public void handleServerKeepAlivePacket(Object client, Object recvPacket, String username) {
        TcpClientSession session = (TcpClientSession) client;
        ServerKeepAlivePacket serverKeepAlivePacket = (ServerKeepAlivePacket) recvPacket;
-        if (ConfigUtil.KeepAlive) {
-            sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
-        }    }
+        sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
+    }

    @Override
    public boolean checkServerPlayerHealthPacket(Object packet) {
--- 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
@ -99,8 +99,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
        TcpClientSession session = (TcpClientSession) client;
        ClientboundPlayerPositionPacket packet = (ClientboundPlayerPositionPacket) recvPacket;
        ServerboundAcceptTeleportationPacket acceptTeleportationPacket = new ServerboundAcceptTeleportationPacket(packet.getTeleportId());
-        ((TcpClientSession) client).send(acceptTeleportationPacket);
-        sendPositionRotationPacket(session, packet.getX(), packet.getY(), packet.getZ(), packet.getYaw(), packet.getYaw());
+        session.send(acceptTeleportationPacket);
        sendClientPlayerMovementPacket(session, true);
    }

@ -127,9 +126,8 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
    public void handleServerKeepAlivePacket(Object client, Object recvPacket, String username) {
        TcpClientSession session = (TcpClientSession) client;
        ClientboundKeepAlivePacket serverKeepAlivePacket = (ClientboundKeepAlivePacket) recvPacket;
-        if (ConfigUtil.KeepAlive) {
-            sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
-        }    }
+        sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
+    }

    @Override
    public boolean checkServerPlayerHealthPacket(Object packet) {
--- 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
@ -97,8 +97,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
        TcpClientSession session = (TcpClientSession) client;
        ClientboundPlayerPositionPacket packet = (ClientboundPlayerPositionPacket) recvPacket;
        ServerboundAcceptTeleportationPacket acceptTeleportationPacket = new ServerboundAcceptTeleportationPacket(packet.getTeleportId());
-        ((TcpClientSession) client).send(acceptTeleportationPacket);
-        sendPositionRotationPacket(session, packet.getX(), packet.getY(), packet.getZ(), packet.getYaw(), packet.getYaw());
+        session.send(acceptTeleportationPacket);
        sendClientPlayerMovementPacket(session, true);
    }

@ -125,9 +124,8 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
    public void handleServerKeepAlivePacket(Object client, Object recvPacket, String username) {
        TcpClientSession session = (TcpClientSession) client;
        ClientboundKeepAlivePacket serverKeepAlivePacket = (ClientboundKeepAlivePacket) recvPacket;
-        if (ConfigUtil.KeepAlive) {
-            sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
-        }    }
+        sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
+    }

    @Override
    public boolean checkServerPlayerHealthPacket(Object packet) {
--- 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
@ -97,8 +97,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
        TcpClientSession session = (TcpClientSession) client;
        ClientboundPlayerPositionPacket packet = (ClientboundPlayerPositionPacket) recvPacket;
        ServerboundAcceptTeleportationPacket acceptTeleportationPacket = new ServerboundAcceptTeleportationPacket(packet.getTeleportId());
-        ((TcpClientSession) client).send(acceptTeleportationPacket);
-        sendPositionRotationPacket(session, packet.getX(), packet.getY(), packet.getZ(), packet.getYaw(), packet.getYaw());
+        session.send(acceptTeleportationPacket);
        sendClientPlayerMovementPacket(session, true);
    }

@ -125,9 +124,8 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
    public void handleServerKeepAlivePacket(Object client, Object recvPacket, String username) {
        TcpClientSession session = (TcpClientSession) client;
        ClientboundKeepAlivePacket serverKeepAlivePacket = (ClientboundKeepAlivePacket) recvPacket;
-        if (ConfigUtil.KeepAlive) {
-            sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
-        }    }
+        sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
+    }

    @Override
    public boolean checkServerPlayerHealthPacket(Object packet) {
--- 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
@ -97,8 +97,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
        TcpClientSession session = (TcpClientSession) client;
        ClientboundPlayerPositionPacket packet = (ClientboundPlayerPositionPacket) recvPacket;
        ServerboundAcceptTeleportationPacket acceptTeleportationPacket = new ServerboundAcceptTeleportationPacket(packet.getTeleportId());
-        ((TcpClientSession) client).send(acceptTeleportationPacket);
-        sendPositionRotationPacket(session, packet.getX(), packet.getY(), packet.getZ(), packet.getYaw(), packet.getYaw());
+        session.send(acceptTeleportationPacket);
        sendClientPlayerMovementPacket(session, true);
    }

@ -125,9 +124,8 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
    public void handleServerKeepAlivePacket(Object client, Object recvPacket, String username) {
        TcpClientSession session = (TcpClientSession) client;
        ClientboundKeepAlivePacket serverKeepAlivePacket = (ClientboundKeepAlivePacket) recvPacket;
-        if (ConfigUtil.KeepAlive) {
-            sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
-        }    }
+        sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
+    }

    @Override
    public boolean checkServerPlayerHealthPacket(Object packet) {
--- 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
@ -104,8 +104,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
        TcpClientSession session = (TcpClientSession) client;
        ClientboundPlayerPositionPacket packet = (ClientboundPlayerPositionPacket) recvPacket;
        ServerboundAcceptTeleportationPacket acceptTeleportationPacket = new ServerboundAcceptTeleportationPacket(packet.getTeleportId());
-        ((TcpClientSession) client).send(acceptTeleportationPacket);
-        sendPositionRotationPacket(session, packet.getX(), packet.getY(), packet.getZ(), packet.getYaw(), packet.getYaw());
+        session.send(acceptTeleportationPacket);
        sendClientPlayerMovementPacket(session, true);
    }

@ -132,9 +131,8 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
    public void handleServerKeepAlivePacket(Object client, Object recvPacket, String username) {
        TcpClientSession session = (TcpClientSession) client;
        ClientboundKeepAlivePacket serverKeepAlivePacket = (ClientboundKeepAlivePacket) recvPacket;
-        if (ConfigUtil.KeepAlive) {
-            sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
-        }    }
+        sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
+    }

    @Override
    public boolean checkServerPlayerHealthPacket(Object packet) {
--- 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
@ -107,8 +107,6 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
    @Override
    public void handleServerPlayerPositionRotationPacket(Object client, Object recvPacket, String username) {
        Session session = ((Client) client).getSession();
-        ServerPlayerPositionRotationPacket packet = (ServerPlayerPositionRotationPacket) recvPacket;
-        sendPositionRotationPacket(session, packet.getX(), packet.getY(), packet.getZ(), packet.getYaw(), packet.getYaw());
        sendClientPlayerMovementPacket(session, true);
    }

@ -135,9 +133,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
    public void handleServerKeepAlivePacket(Object client, Object recvPacket, String username) {
        Session session = ((Client) client).getSession();
        ServerKeepAlivePacket serverKeepAlivePacket = (ServerKeepAlivePacket) recvPacket;
-        if (ConfigUtil.KeepAlive) {
-            sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
-        }
+        sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
    }

    @Override
--- 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
@ -111,8 +111,6 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
    @Override
    public void handleServerPlayerPositionRotationPacket(Object client, Object recvPacket, String username) {
        Session session = ((Client) client).getSession();
-        ServerPlayerPositionRotationPacket packet = (ServerPlayerPositionRotationPacket) recvPacket;
-        sendPositionRotationPacket(session, packet.getX(), packet.getY(), packet.getZ(), packet.getYaw(), packet.getYaw());
        sendClientPlayerMovementPacket(session, true);
    }

@ -139,9 +137,7 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
    public void handleServerKeepAlivePacket(Object client, Object recvPacket, String username) {
        Session session = ((Client) client).getSession();
        ServerKeepAlivePacket serverKeepAlivePacket = (ServerKeepAlivePacket) recvPacket;
-        if (ConfigUtil.KeepAlive) {
-            sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
-        }
+        sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
    }

    @Override
--- 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
@ -115,7 +115,6 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
        ServerPlayerPositionRotationPacket packet = (ServerPlayerPositionRotationPacket) recvPacket;
        ClientTeleportConfirmPacket teleportConfirmPacket = new ClientTeleportConfirmPacket(packet.getTeleportId());
        session.send(teleportConfirmPacket);
-        sendPositionRotationPacket(session, packet.getX(), packet.getY(), packet.getZ(), packet.getYaw(), packet.getYaw());
        sendClientPlayerMovementPacket(session, true);
    }

@ -142,9 +141,8 @@ public class PacketHandler implements cn.serendipityr.EndMinecraftPlusV2.Multipl
    public void handleServerKeepAlivePacket(Object client, Object recvPacket, String username) {
        Session session = ((Client) client).getSession();
        ServerKeepAlivePacket serverKeepAlivePacket = (ServerKeepAlivePacket) recvPacket;
-        if (ConfigUtil.KeepAlive) {
-            sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
-        }    }
+        sendClientKeepAlivePacket(session, serverKeepAlivePacket.getPingId());
+    }

    @Override
    public boolean checkServerPlayerHealthPacket(Object packet) {