mirror of
https://github.com/SerendipityR-2022/EndMinecraftPlusV2.git
synced 2024-09-18 23:03:08 +00:00
Fix: 优化部分逻辑
This commit is contained in:
parent
e6c636ae98
commit
7afecf062c
@ -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:
|
||||
|
@ -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()) {
|
||||
|
||||
|
@ -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();
|
||||
}
|
||||
|
@ -104,8 +104,7 @@ BotSettings:
|
||||
KeepAlive: false
|
||||
# 是否响应服务器位置数据包
|
||||
# 如果你发现假人断开连接的原因与"位置异常"相关,请尝试切换此项。
|
||||
Move: ture
|
||||
|
||||
Move: true
|
||||
# 重新加入前模拟刷新服务器列表
|
||||
GetMotdBeforeRejoin: true
|
||||
GetMotdCount: 5
|
||||
|
@ -14,6 +14,14 @@ public class ProxyUtil {
|
||||
public static List<String> proxies = new CopyOnWriteArrayList<>();
|
||||
public static List<Proxy> 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;
|
||||
|
||||
|
@ -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":
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user