Reformat and clean up "net" package

This commit is contained in:
P0nk
2021-09-09 23:26:02 +02:00
parent 69f4580637
commit 6be6ea9927
235 changed files with 3556 additions and 3398 deletions

View File

@@ -28,13 +28,13 @@ public final class ViewAllCharRegisterPicHandler extends AbstractPacketHandler {
default -> 9;
};
}
@Override
public final void handlePacket(InPacket p, Client c) {
p.readByte();
int charId = p.readInt();
p.readInt(); // please don't let the client choose which world they should login
String mac = p.readString();
String hostString = p.readString();
@@ -46,10 +46,10 @@ public final class ViewAllCharRegisterPicHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.getAfterLoginError(17));
return;
}
c.updateMacs(mac);
c.updateHwid(hwid);
if (c.hasBannedMac() || c.hasBannedHWID()) {
SessionCoordinator.getInstance().closeSession(c, true);
return;
@@ -60,35 +60,35 @@ public final class ViewAllCharRegisterPicHandler extends AbstractPacketHandler {
c.sendPacket(PacketCreator.getAfterLoginError(parseAntiMulticlientError(res)));
return;
}
Server server = Server.getInstance();
if(!server.haveCharacterEntry(c.getAccID(), charId)) {
if (!server.haveCharacterEntry(c.getAccID(), charId)) {
SessionCoordinator.getInstance().closeSession(c, true);
return;
}
c.setWorld(server.getCharacterWorld(charId));
World wserv = c.getWorldServer();
if(wserv == null || wserv.isWorldCapacityFull()) {
if (wserv == null || wserv.isWorldCapacityFull()) {
c.sendPacket(PacketCreator.getAfterLoginError(10));
return;
}
int channel = Randomizer.rand(1, server.getWorld(c.getWorld()).getChannelsSize());
c.setChannel(channel);
String pic = p.readString();
c.setPic(pic);
String[] socket = server.getInetSocket(c, c.getWorld(), channel);
if (socket == null) {
c.sendPacket(PacketCreator.getAfterLoginError(10));
return;
}
server.unregisterLoginState(c);
c.setCharacterOnSessionTransitionState(charId);
try {
c.sendPacket(PacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId));
} catch (UnknownHostException e) {