diff --git a/Main/src/cn/serendipityr/EndMinecraftPlusV2/AttackManager/AttackManager.java b/Main/src/cn/serendipityr/EndMinecraftPlusV2/AttackManager/AttackManager.java index 07aafa7..de92c84 100644 --- a/Main/src/cn/serendipityr/EndMinecraftPlusV2/AttackManager/AttackManager.java +++ b/Main/src/cn/serendipityr/EndMinecraftPlusV2/AttackManager/AttackManager.java @@ -4,6 +4,7 @@ import cn.serendipityr.EndMinecraftPlusV2.EndMinecraftPlusV2; import cn.serendipityr.EndMinecraftPlusV2.MultipleVersion.Bot.BotHandler; import cn.serendipityr.EndMinecraftPlusV2.MultipleVersion.Bot.BotManager; import cn.serendipityr.EndMinecraftPlusV2.MultipleVersion.Packet.PacketHandler; +import cn.serendipityr.EndMinecraftPlusV2.Tools.ProxyUtil; import cn.serendipityr.EndMinecraftPlusV2.VersionManager.ProtocolLibs; import cn.serendipityr.EndMinecraftPlusV2.Tools.ConfigUtil; import cn.serendipityr.EndMinecraftPlusV2.Tools.DataUtil; @@ -93,6 +94,7 @@ public class AttackManager { if (ConfigUtil.AttackMethod.equals(5)) { botManager.test(); } else { + ProxyUtil.prepareProxy(); botManager.startTask(isDoubleAttack, ProtocolLibs.getProtocolVersion()); } break; @@ -102,6 +104,7 @@ public class AttackManager { break; case 3: // MotdAttack(P) + ProxyUtil.prepareProxy(); MotdAttack.doAttack(true); break; default: diff --git a/Main/src/cn/serendipityr/EndMinecraftPlusV2/AttackManager/MotdAttack.java b/Main/src/cn/serendipityr/EndMinecraftPlusV2/AttackManager/MotdAttack.java index bf0cb73..01bcadf 100644 --- a/Main/src/cn/serendipityr/EndMinecraftPlusV2/AttackManager/MotdAttack.java +++ b/Main/src/cn/serendipityr/EndMinecraftPlusV2/AttackManager/MotdAttack.java @@ -75,10 +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)); + socket.connect(new InetSocketAddress(ConfigUtil.AttackAddress, ConfigUtil.AttackPort), ConfigUtil.ConnectTimeout * 1000); try (OutputStream out = socket.getOutputStream(); InputStream in = socket.getInputStream()) { diff --git a/Main/src/cn/serendipityr/EndMinecraftPlusV2/EndMinecraftPlusV2.java b/Main/src/cn/serendipityr/EndMinecraftPlusV2/EndMinecraftPlusV2.java index be07b3c..af40760 100644 --- a/Main/src/cn/serendipityr/EndMinecraftPlusV2/EndMinecraftPlusV2.java +++ b/Main/src/cn/serendipityr/EndMinecraftPlusV2/EndMinecraftPlusV2.java @@ -24,7 +24,6 @@ public class EndMinecraftPlusV2 { } LogUtil.emptyLog(); prepareConfig(); - prepareProxy(); startAttack(); } @@ -37,14 +36,6 @@ public class EndMinecraftPlusV2 { } } - public static void prepareProxy() { - if (!ConfigUtil.AttackMethod.equals(2)) { - LogUtil.doLog(0, "正在获取代理...", "ProxyUtil"); - ProxyUtil.getProxies(); - ProxyUtil.runUpdateProxiesTask(ConfigUtil.ProxyUpdateTime); - } - } - public static void startAttack() { AttackManager.doAttack(); } diff --git a/Main/src/config.yml b/Main/src/config.yml index ebc89be..d3c42fa 100644 --- a/Main/src/config.yml +++ b/Main/src/config.yml @@ -104,8 +104,7 @@ BotSettings: KeepAlive: false # 是否响应服务器位置数据包 # 如果你发现假人断开连接的原因与"位置异常"相关,请尝试切换此项。 - Move: ture - + Move: true # 重新加入前模拟刷新服务器列表 GetMotdBeforeRejoin: true GetMotdCount: 5 diff --git a/Tools/src/cn/serendipityr/EndMinecraftPlusV2/Tools/ProxyUtil.java b/Tools/src/cn/serendipityr/EndMinecraftPlusV2/Tools/ProxyUtil.java index 15e8eed..a397753 100644 --- a/Tools/src/cn/serendipityr/EndMinecraftPlusV2/Tools/ProxyUtil.java +++ b/Tools/src/cn/serendipityr/EndMinecraftPlusV2/Tools/ProxyUtil.java @@ -14,6 +14,14 @@ public class ProxyUtil { public static List proxies = new CopyOnWriteArrayList<>(); public static List workingProxiesList = new CopyOnWriteArrayList<>(); + public static void prepareProxy() { + if (!ConfigUtil.AttackMethod.equals(2)) { + LogUtil.doLog(0, "正在获取代理...", "ProxyUtil"); + ProxyUtil.getProxies(); + ProxyUtil.runUpdateProxiesTask(ConfigUtil.ProxyUpdateTime); + } + } + public static void getProxies() { String getMethod; diff --git a/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Bot/BotManager.java b/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Bot/BotManager.java index 6832fcb..3d059d6 100644 --- a/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Bot/BotManager.java +++ b/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Bot/BotManager.java @@ -64,7 +64,6 @@ public class BotManager { if (positionList.containsKey(client)) { LogUtil.doLog(0, "[DEBUG] [行动] 尝试进行随机传送: " + count + "次", "BotAttack"); packetHandler.sendPositionPacketFromPacket(client, positionList.get(client), true); - } break; case "backTeleport": 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 3dff163..e949d1c 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 @@ -19,7 +19,6 @@ import org.spacehq.mc.protocol.packet.ingame.client.*; import org.spacehq.mc.protocol.packet.ingame.client.player.ClientChangeHeldItemPacket; import org.spacehq.mc.protocol.packet.ingame.client.player.ClientPlayerMovementPacket; import org.spacehq.mc.protocol.packet.ingame.client.player.ClientPlayerPositionRotationPacket; -import org.spacehq.mc.protocol.packet.ingame.client.window.ClientConfirmTransactionPacket; import org.spacehq.mc.protocol.packet.ingame.server.ServerChatPacket; import org.spacehq.mc.protocol.packet.ingame.server.ServerJoinGamePacket; import org.spacehq.mc.protocol.packet.ingame.server.ServerKeepAlivePacket;