Redstone1024/EndMinecraftPlusV2
1
0
Fork 0
mirror of https://github.com/SerendipityR-2022/EndMinecraftPlusV2.git synced 2024-09-19 15:23:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix: 运行时获取代理触发NPE

Browse Source
This commit is contained in:
SerendipityR 2024-01-31 18:25:28 +08:00 committed by GitHub
parent 7b18e51083
commit 38c97d27b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Main/src/cn/serendipityr/EndMinecraftPlusV2/AttackManager/MotdAttack.java
View File

@ -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);

4
Main/src/cn/serendipityr/EndMinecraftPlusV2/EndMinecraftPlusV2.java
View File

@ -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";

7
VersionFactory/src/cn/serendipityr/EndMinecraftPlusV2/MultipleVersion/Bot/BotManager.java
View File

@ -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":