From 38c97d27b2ec754cea469bf7ce664ebbb3f71a7c Mon Sep 17 00:00:00 2001
From: SerendipityR <48401197+SerendipityR-2022@users.noreply.github.com>
Date: Wed, 31 Jan 2024 18:25:28 +0800
Subject: [PATCH] =?UTF-8?q?Fix:=20=E8=BF=90=E8=A1=8C=E6=97=B6=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=BB=A3=E7=90=86=E8=A7=A6=E5=8F=91NPE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EndMinecraftPlusV2/AttackManager/MotdAttack.java      | 8 ++++----
 .../EndMinecraftPlusV2/EndMinecraftPlusV2.java            | 4 +---
 .../MultipleVersion/Bot/BotManager.java                   | 7 +++++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Main/src/cn/serendipityr/EndMinecraftPlusV2/AttackManager/MotdAttack.java b/Main/src/cn/serendipityr/EndMinecraftPlusV2/AttackManager/MotdAttack.java
index 01bcadf..0abbfbc 100644
--- a/Main/src/cn/serendipityr/EndMinecraftPlusV2/AttackManager/MotdAttack.java
+++ b/Main/src/cn/serendipityr/EndMinecraftPlusV2/AttackManager/MotdAttack.java
@@ -1,10 +1,7 @@
 package cn.serendipityr.EndMinecraftPlusV2.AttackManager;
 
 import cn.serendipityr.EndMinecraftPlusV2.MultipleVersion.UniverseMethods;
-import cn.serendipityr.EndMinecraftPlusV2.Tools.ConfigUtil;
-import cn.serendipityr.EndMinecraftPlusV2.Tools.LogUtil;
-import cn.serendipityr.EndMinecraftPlusV2.Tools.OtherUtils;
-import cn.serendipityr.EndMinecraftPlusV2.Tools.SetTitle;
+import cn.serendipityr.EndMinecraftPlusV2.Tools.*;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -72,6 +69,9 @@ public class MotdAttack {
         public void run() {
             try {
                 // 使用或不使用代理初始化 socket
+                if (ProxyUtil.proxies.size() == 0) {
+                    return;
+                }
                 Proxy proxy = hasProxy ? UniverseMethods.getProxy(UniverseMethods.getProxyType(ConfigUtil.ProxyType)) : Proxy.NO_PROXY;
                 Socket socket = new Socket(proxy);
 
diff --git a/Main/src/cn/serendipityr/EndMinecraftPlusV2/EndMinecraftPlusV2.java b/Main/src/cn/serendipityr/EndMinecraftPlusV2/EndMinecraftPlusV2.java
index af40760..daacc7f 100644
--- a/Main/src/cn/serendipityr/EndMinecraftPlusV2/EndMinecraftPlusV2.java
+++ b/Main/src/cn/serendipityr/EndMinecraftPlusV2/EndMinecraftPlusV2.java
@@ -1,11 +1,9 @@
 package cn.serendipityr.EndMinecraftPlusV2;
 
+import cn.serendipityr.EndMinecraftPlusV2.AttackManager.AttackManager;
 import cn.serendipityr.EndMinecraftPlusV2.Tools.ConfigUtil;
 import cn.serendipityr.EndMinecraftPlusV2.Tools.LogUtil;
-import cn.serendipityr.EndMinecraftPlusV2.Tools.ProxyUtil;
 import cn.serendipityr.EndMinecraftPlusV2.Tools.SetTitle;
-import cn.serendipityr.EndMinecraftPlusV2.AttackManager.AttackManager;
-import cn.serendipityr.EndMinecraftPlusV2.VersionManager.ProtocolLibs;
 
 public class EndMinecraftPlusV2 {
     public static String ver = "2.0.3";
diff --git a/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Bot/BotManager.java b/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Bot/BotManager.java
index 3d059d6..37b169d 100644
--- a/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Bot/BotManager.java
+++ b/VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Bot/BotManager.java
@@ -75,7 +75,7 @@ public class BotManager {
                     case "register&Login":
                         String pwd = _action[1];
                         LogUtil.doLog(0, "[DEBUG] [行动] 尝试执行注册/登录: " + pwd, "BotAttack");
-                        doRegisterLogin(client, userName, 0, pwd);
+                        doRegisterLogin(client, userName, 2000, pwd);
                         break;
                     case "crashPacket":
                         int count_ = Integer.parseInt(_action[1]);
@@ -149,6 +149,9 @@ public class BotManager {
         public void run() {
             // 获取对应代理（一号一个）
             Proxy.Type proxyType = UniverseMethods.getProxyType(ConfigUtil.ProxyType);
+            if (ProxyUtil.proxies.size() == 0) {
+                return;
+            }
             Proxy proxy = UniverseMethods.getProxy(proxyType);
 
             // 获取Bot名称
@@ -282,7 +285,7 @@ public class BotManager {
                     if (ConfigUtil.BotActionDetails) {
                         LogUtil.doLog(0, "[" + userName + "] [行动] 尝试执行注册/登录: " + pwd, "BotAttack");
                     }
-                    doRegisterLogin(client, userName, 0, pwd);
+                    doRegisterLogin(client, userName, 2000, pwd);
                 }
                 break;
             case "crashPacket":