mirror of
https://github.com/SerendipityR-2022/EndMinecraftPlusV2.git
synced 2024-09-19 23:33:06 +00:00
Fix: 运行时获取代理触发NPE
This commit is contained in:
parent
7b18e51083
commit
38c97d27b2
@ -1,10 +1,7 @@
|
|||||||
package cn.serendipityr.EndMinecraftPlusV2.AttackManager;
|
package cn.serendipityr.EndMinecraftPlusV2.AttackManager;
|
||||||
|
|
||||||
import cn.serendipityr.EndMinecraftPlusV2.MultipleVersion.UniverseMethods;
|
import cn.serendipityr.EndMinecraftPlusV2.MultipleVersion.UniverseMethods;
|
||||||
import cn.serendipityr.EndMinecraftPlusV2.Tools.ConfigUtil;
|
import cn.serendipityr.EndMinecraftPlusV2.Tools.*;
|
||||||
import cn.serendipityr.EndMinecraftPlusV2.Tools.LogUtil;
|
|
||||||
import cn.serendipityr.EndMinecraftPlusV2.Tools.OtherUtils;
|
|
||||||
import cn.serendipityr.EndMinecraftPlusV2.Tools.SetTitle;
|
|
||||||
|
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
@ -72,6 +69,9 @@ public class MotdAttack {
|
|||||||
public void run() {
|
public void run() {
|
||||||
try {
|
try {
|
||||||
// 使用或不使用代理初始化 socket
|
// 使用或不使用代理初始化 socket
|
||||||
|
if (ProxyUtil.proxies.size() == 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
Proxy proxy = hasProxy ? UniverseMethods.getProxy(UniverseMethods.getProxyType(ConfigUtil.ProxyType)) : Proxy.NO_PROXY;
|
Proxy proxy = hasProxy ? UniverseMethods.getProxy(UniverseMethods.getProxyType(ConfigUtil.ProxyType)) : Proxy.NO_PROXY;
|
||||||
Socket socket = new Socket(proxy);
|
Socket socket = new Socket(proxy);
|
||||||
|
|
||||||
|
@ -1,11 +1,9 @@
|
|||||||
package cn.serendipityr.EndMinecraftPlusV2;
|
package cn.serendipityr.EndMinecraftPlusV2;
|
||||||
|
|
||||||
|
import cn.serendipityr.EndMinecraftPlusV2.AttackManager.AttackManager;
|
||||||
import cn.serendipityr.EndMinecraftPlusV2.Tools.ConfigUtil;
|
import cn.serendipityr.EndMinecraftPlusV2.Tools.ConfigUtil;
|
||||||
import cn.serendipityr.EndMinecraftPlusV2.Tools.LogUtil;
|
import cn.serendipityr.EndMinecraftPlusV2.Tools.LogUtil;
|
||||||
import cn.serendipityr.EndMinecraftPlusV2.Tools.ProxyUtil;
|
|
||||||
import cn.serendipityr.EndMinecraftPlusV2.Tools.SetTitle;
|
import cn.serendipityr.EndMinecraftPlusV2.Tools.SetTitle;
|
||||||
import cn.serendipityr.EndMinecraftPlusV2.AttackManager.AttackManager;
|
|
||||||
import cn.serendipityr.EndMinecraftPlusV2.VersionManager.ProtocolLibs;
|
|
||||||
|
|
||||||
public class EndMinecraftPlusV2 {
|
public class EndMinecraftPlusV2 {
|
||||||
public static String ver = "2.0.3";
|
public static String ver = "2.0.3";
|
||||||
|
@ -75,7 +75,7 @@ public class BotManager {
|
|||||||
case "register&Login":
|
case "register&Login":
|
||||||
String pwd = _action[1];
|
String pwd = _action[1];
|
||||||
LogUtil.doLog(0, "[DEBUG] [行动] 尝试执行注册/登录: " + pwd, "BotAttack");
|
LogUtil.doLog(0, "[DEBUG] [行动] 尝试执行注册/登录: " + pwd, "BotAttack");
|
||||||
doRegisterLogin(client, userName, 0, pwd);
|
doRegisterLogin(client, userName, 2000, pwd);
|
||||||
break;
|
break;
|
||||||
case "crashPacket":
|
case "crashPacket":
|
||||||
int count_ = Integer.parseInt(_action[1]);
|
int count_ = Integer.parseInt(_action[1]);
|
||||||
@ -149,6 +149,9 @@ public class BotManager {
|
|||||||
public void run() {
|
public void run() {
|
||||||
// 获取对应代理(一号一个)
|
// 获取对应代理(一号一个)
|
||||||
Proxy.Type proxyType = UniverseMethods.getProxyType(ConfigUtil.ProxyType);
|
Proxy.Type proxyType = UniverseMethods.getProxyType(ConfigUtil.ProxyType);
|
||||||
|
if (ProxyUtil.proxies.size() == 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
Proxy proxy = UniverseMethods.getProxy(proxyType);
|
Proxy proxy = UniverseMethods.getProxy(proxyType);
|
||||||
|
|
||||||
// 获取Bot名称
|
// 获取Bot名称
|
||||||
@ -282,7 +285,7 @@ public class BotManager {
|
|||||||
if (ConfigUtil.BotActionDetails) {
|
if (ConfigUtil.BotActionDetails) {
|
||||||
LogUtil.doLog(0, "[" + userName + "] [行动] 尝试执行注册/登录: " + pwd, "BotAttack");
|
LogUtil.doLog(0, "[" + userName + "] [行动] 尝试执行注册/登录: " + pwd, "BotAttack");
|
||||||
}
|
}
|
||||||
doRegisterLogin(client, userName, 0, pwd);
|
doRegisterLogin(client, userName, 2000, pwd);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case "crashPacket":
|
case "crashPacket":
|
||||||
|
Loading…
Reference in New Issue
Block a user