Fix: 连接超时时间未被正确配置

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.1";
-    public static Integer CfgVer = 8;
+    public static String ver = "2.0.2";
+    public static Integer CfgVer = 9;
 
     public static void main(String[] args) {
         System.out.println("=======================-Designed by SerendipityR-=======================");

Main/src/config.yml

@@ -3,7 +3,7 @@
 #   Designed by SerendipityR  #
 ###############################
 
-CfgVer: 8
+CfgVer: 9
 
 AttackSettings:
   Address: "example.com"
@@ -17,7 +17,8 @@ AttackSettings:
   Method: 1
   Time: 3600
   ConnectDelay: 15
-  ConnectTimeout: 5000
+  # 连接超时时间(s)
+  ConnectTimeout: 5
   # 实际连接数由代理质量和机器性能有关
   # 进行无代理Motd压测时不建议大于32
   MaxConnections: 2500
@@ -128,7 +129,7 @@ BotSettings:
   ShowServerMessages: true
   # 行动流程
   # async - 异步执行任务
-  # wait - 等待:<时间(ms)>_<flag>
+  # wait - 等待:<时间(ms)>_<flag>_<是否判断flag>
   # chatSpam - 随机发送聊天信息:<次数>_<间隔(ms)>_<flag>
   # randomTeleport - 随机传送:<次数>_<间隔(ms)>_<flag>
   # backTeleport - 回到重生点_<flag>
@@ -136,6 +137,7 @@ BotSettings:
   # crashPacket - 发送崩服数据包:<数量>_<flag>
   # tabAttack - 执行Tab补全:<数量>_<间隔(ms)>_<flag>
   Actions:
+    - "wait:3000_none"
     - "register&Login:true_genshinImpact"
     - "async|chatSpam:10_3000_login"
     - "async|randomTeleport:25_100_login"

Tools/src/cn/serendipityr/EndMinecraftPlusV2/Tools/ConfigUtil.java

@@ -26,7 +26,7 @@ public class ConfigUtil {
     public static Integer AttackMethod;
     public static Integer AttackTime;
     public static Long ConnectDelay;
-    public static Long ConnectTimeout;
+    public static Integer ConnectTimeout;
     public static Integer MaxConnections;
     public static Boolean AntiAttackMode;
     public static String DoubleExploitPlayer;
@@ -88,7 +88,7 @@ public class ConfigUtil {
             AttackMethod = config.getInt("AttackSettings.Method");
             AttackTime = config.getInt("AttackSettings.Time");
             ConnectDelay = config.getLong("AttackSettings.ConnectDelay");
-            ConnectTimeout = config.getLong("AttackSettings.ConnectTimeout");
+            ConnectTimeout = config.getInt("AttackSettings.ConnectTimeout");
             MaxConnections = config.getInt("AttackSettings.MaxConnections");
             AntiAttackMode = config.getBoolean("AttackSettings.AntiAttackMode");
             DoubleExploitPlayer = config.getString("AttackSettings.DoubleExploitPlayer");

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

@@ -22,5 +22,5 @@ public interface BotHandler {
     void setClientFlag(Object client, String flag, Object value);
     Object getClientFlag(Object client, String flag);
 
-    void setClientTimeout(Object client, long timeout);
+    void setClientTimeout(Object client, int timeout);
 }

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

@@ -223,7 +223,7 @@ public class BotManager {
                 String[] waitArgs = _action[1].split("_");
                 long waitTime = Long.parseLong(waitArgs[0]);
                 String waitFlag = waitArgs[1];
-                if (botHandler.hasClientFlag(client, waitFlag)) {
+                if ("none".equals(waitFlag) || botHandler.hasClientFlag(client, waitFlag)) {
                     if (ConfigUtil.BotActionDetails) {
                         LogUtil.doLog(0, "[" + userName + "] [行动] 等待: " + waitTime + "毫秒", "BotAttack");
                     }

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

@@ -172,9 +172,10 @@ public class BotHandler implements cn.serendipityr.EndMinecraftPlusV2.MultipleVe
     }
 
     @Override
-    public void setClientTimeout(Object client, long timeout) {
+    public void setClientTimeout(Object client, int timeout) {
         Client c = (Client) client;
-        c.getSession().setReadTimeout(Math.toIntExact(timeout));
-        c.getSession().setWriteTimeout(Math.toIntExact(timeout));
+        c.getSession().setReadTimeout(timeout);
+        c.getSession().setWriteTimeout(timeout);
+        c.getSession().setConnectTimeout(timeout);
     }
 }

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

@@ -172,9 +172,10 @@ public class BotHandler implements cn.serendipityr.EndMinecraftPlusV2.MultipleVe
     }
 
     @Override
-    public void setClientTimeout(Object client, long timeout) {
+    public void setClientTimeout(Object client, int timeout) {
         Client c = (Client) client;
-        c.getSession().setReadTimeout(Math.toIntExact(timeout));
-        c.getSession().setWriteTimeout(Math.toIntExact(timeout));
+        c.getSession().setReadTimeout(timeout);
+        c.getSession().setWriteTimeout(timeout);
+        c.getSession().setConnectTimeout(timeout);
     }
 }

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

@@ -176,9 +176,10 @@ public class BotHandler implements cn.serendipityr.EndMinecraftPlusV2.MultipleVe
     }
 
     @Override
-    public void setClientTimeout(Object client, long timeout) {
+    public void setClientTimeout(Object client, int timeout) {
         Client c = (Client) client;
-        c.getSession().setReadTimeout(Math.toIntExact(timeout));
-        c.getSession().setWriteTimeout(Math.toIntExact(timeout));
+        c.getSession().setReadTimeout(timeout);
+        c.getSession().setWriteTimeout(timeout);
+        c.getSession().setConnectTimeout(timeout);
     }
 }

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

@@ -186,10 +186,11 @@ public class BotHandler implements cn.serendipityr.EndMinecraftPlusV2.MultipleVe
     }
 
     @Override
-    public void setClientTimeout(Object client, long timeout) {
+    public void setClientTimeout(Object client, int timeout) {
         Client c = (Client) client;
-        c.getSession().setReadTimeout(Math.toIntExact(timeout));
-        c.getSession().setWriteTimeout(Math.toIntExact(timeout));
+        c.getSession().setReadTimeout(timeout);
+        c.getSession().setWriteTimeout(timeout);
+        c.getSession().setConnectTimeout(timeout);
     }
 
     private static ProxyInfo.Type getProxyType(int type) {

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

@@ -186,10 +186,11 @@ public class BotHandler implements cn.serendipityr.EndMinecraftPlusV2.MultipleVe
     }
 
     @Override
-    public void setClientTimeout(Object client, long timeout) {
+    public void setClientTimeout(Object client, int timeout) {
         Client c = (Client) client;
-        c.getSession().setReadTimeout(Math.toIntExact(timeout));
-        c.getSession().setWriteTimeout(Math.toIntExact(timeout));
+        c.getSession().setReadTimeout(timeout);
+        c.getSession().setWriteTimeout(timeout);
+        c.getSession().setConnectTimeout(timeout);
     }
 
     private static ProxyInfo.Type getProxyType(int type) {

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

@@ -185,10 +185,11 @@ public class BotHandler implements cn.serendipityr.EndMinecraftPlusV2.MultipleVe
     }
 
     @Override
-    public void setClientTimeout(Object client, long timeout) {
+    public void setClientTimeout(Object client, int timeout) {
         TcpClientSession c = (TcpClientSession) client;
-        c.setReadTimeout(Math.toIntExact(timeout));
-        c.setWriteTimeout(Math.toIntExact(timeout));
+        c.setReadTimeout(timeout);
+        c.setWriteTimeout(timeout);
+        c.setConnectTimeout(timeout);
     }
 
     private static ProxyInfo.Type getProxyType(int type) {

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

@@ -202,10 +202,11 @@ public class BotHandler implements cn.serendipityr.EndMinecraftPlusV2.MultipleVe
     }
 
     @Override
-    public void setClientTimeout(Object client, long timeout) {
+    public void setClientTimeout(Object client, int timeout) {
         TcpClientSession c = (TcpClientSession) client;
-        c.setReadTimeout(Math.toIntExact(timeout));
-        c.setWriteTimeout(Math.toIntExact(timeout));
+        c.setReadTimeout(timeout);
+        c.setWriteTimeout(timeout);
+        c.setConnectTimeout(timeout);
     }
 
     private static ProxyInfo.Type getProxyType(int type) {

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

@@ -191,10 +191,11 @@ public class BotHandler implements cn.serendipityr.EndMinecraftPlusV2.MultipleVe
     }
 
     @Override
-    public void setClientTimeout(Object client, long timeout) {
+    public void setClientTimeout(Object client, int timeout) {
         TcpClientSession c = (TcpClientSession) client;
-        c.setReadTimeout(Math.toIntExact(timeout));
-        c.setWriteTimeout(Math.toIntExact(timeout));
+        c.setReadTimeout(timeout);
+        c.setWriteTimeout(timeout);
+        c.setConnectTimeout(timeout);
     }
 
     private static ProxyInfo.Type getProxyType(int type) {

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

@@ -191,10 +191,11 @@ public class BotHandler implements cn.serendipityr.EndMinecraftPlusV2.MultipleVe
     }
 
     @Override
-    public void setClientTimeout(Object client, long timeout) {
+    public void setClientTimeout(Object client, int timeout) {
         TcpClientSession c = (TcpClientSession) client;
-        c.setReadTimeout(Math.toIntExact(timeout));
-        c.setWriteTimeout(Math.toIntExact(timeout));
+        c.setReadTimeout(timeout);
+        c.setWriteTimeout(timeout);
+        c.setConnectTimeout(timeout);
     }
 
     private static ProxyInfo.Type getProxyType(int type) {

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

@@ -197,10 +197,11 @@ public class BotHandler implements cn.serendipityr.EndMinecraftPlusV2.MultipleVe
     }
 
     @Override
-    public void setClientTimeout(Object client, long timeout) {
+    public void setClientTimeout(Object client, int timeout) {
         TcpClientSession c = (TcpClientSession) client;
-        c.setReadTimeout(Math.toIntExact(timeout));
-        c.setWriteTimeout(Math.toIntExact(timeout));
+        c.setReadTimeout(timeout);
+        c.setWriteTimeout(timeout);
+        c.setConnectTimeout(timeout);
     }
 
     private static ProxyInfo.Type getProxyType(int type) {

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

@@ -197,10 +197,11 @@ public class BotHandler implements cn.serendipityr.EndMinecraftPlusV2.MultipleVe
     }
 
     @Override
-    public void setClientTimeout(Object client, long timeout) {
+    public void setClientTimeout(Object client, int timeout) {
         TcpClientSession c = (TcpClientSession) client;
-        c.setReadTimeout(Math.toIntExact(timeout));
-        c.setWriteTimeout(Math.toIntExact(timeout));
+        c.setReadTimeout(timeout);
+        c.setWriteTimeout(timeout);
+        c.setConnectTimeout(timeout);
     }
 
     private static ProxyInfo.Type getProxyType(int type) {

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

@@ -172,9 +172,10 @@ public class BotHandler implements cn.serendipityr.EndMinecraftPlusV2.MultipleVe
     }
 
     @Override
-    public void setClientTimeout(Object client, long timeout) {
+    public void setClientTimeout(Object client, int timeout) {
         Client c = (Client) client;
-        c.getSession().setReadTimeout(Math.toIntExact(timeout));
-        c.getSession().setWriteTimeout(Math.toIntExact(timeout));
+        c.getSession().setReadTimeout(timeout);
+        c.getSession().setWriteTimeout(timeout);
+        c.getSession().setConnectTimeout(timeout);
     }
 }

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

@@ -172,9 +172,10 @@ public class BotHandler implements cn.serendipityr.EndMinecraftPlusV2.MultipleVe
     }
 
     @Override
-    public void setClientTimeout(Object client, long timeout) {
+    public void setClientTimeout(Object client, int timeout) {
         Client c = (Client) client;
-        c.getSession().setReadTimeout(Math.toIntExact(timeout));
-        c.getSession().setWriteTimeout(Math.toIntExact(timeout));
+        c.getSession().setReadTimeout(timeout);
+        c.getSession().setWriteTimeout(timeout);
+        c.getSession().setConnectTimeout(timeout);
     }
 }

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

@@ -172,9 +172,10 @@ public class BotHandler implements cn.serendipityr.EndMinecraftPlusV2.MultipleVe
     }
 
     @Override
-    public void setClientTimeout(Object client, long timeout) {
+    public void setClientTimeout(Object client, int timeout) {
         Client c = (Client) client;
-        c.getSession().setReadTimeout(Math.toIntExact(timeout));
-        c.getSession().setWriteTimeout(Math.toIntExact(timeout));
+        c.getSession().setReadTimeout(timeout);
+        c.getSession().setWriteTimeout(timeout);
+        c.getSession().setConnectTimeout(timeout);
     }
 }