Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove "Maple" prefix from MaplePacketCreator name

Browse Source
This commit is contained in:
P0nk
2021-08-19 21:31:57 +02:00
parent 579e3c639f
commit e184f25184
307 changed files with 2285 additions and 2328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/server/handlers/CustomPacketHandler.java
View File

@@ -23,14 +23,14 @@ package net.server.handlers;
import client.MapleClient;
import net.MaplePacketHandler;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
public class CustomPacketHandler implements MaplePacketHandler {
@Override
public void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
if (slea.available() > 0 && c.getGMLevel() == 4) {//w/e
c.announce(MaplePacketCreator.customPacket(slea.read((int) slea.available())));
c.announce(PacketCreator.customPacket(slea.read((int) slea.available())));
}
}

6
src/main/java/net/server/handlers/login/AcceptToSHandler.java
View File

@@ -2,7 +2,7 @@ package net.server.handlers.login;
import client.MapleClient;
import net.AbstractMaplePacketHandler;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
/**
@@ -23,9 +23,9 @@ public final class AcceptToSHandler extends AbstractMaplePacketHandler {
return;
}
if (c.finishLogin() == 0) {
c.announce(MaplePacketCreator.getAuthSuccess(c));
c.announce(PacketCreator.getAuthSuccess(c));
} else {
c.announce(MaplePacketCreator.getLoginFailed(9));//shouldn't happen XD
c.announce(PacketCreator.getLoginFailed(9));//shouldn't happen XD
}
}
}

14
src/main/java/net/server/handlers/login/AfterLoginHandler.java
View File

@@ -24,7 +24,7 @@ package net.server.handlers.login;
import client.MapleClient;
import net.AbstractMaplePacketHandler;
import net.server.coordinator.session.SessionCoordinator;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
public final class AfterLoginHandler extends AbstractMaplePacketHandler {
@@ -38,23 +38,23 @@ public final class AfterLoginHandler extends AbstractMaplePacketHandler {
}
if (c2 == 1 && c3 == 1) {
if (c.getPin() == null || c.getPin().equals("")) {
c.announce(MaplePacketCreator.registerPin());
c.announce(PacketCreator.registerPin());
} else {
c.announce(MaplePacketCreator.requestPin());
c.announce(PacketCreator.requestPin());
}
} else if (c2 == 1 && c3 == 0) {
String pin = slea.readMapleAsciiString();
if (c.checkPin(pin)) {
c.announce(MaplePacketCreator.pinAccepted());
c.announce(PacketCreator.pinAccepted());
} else {
c.announce(MaplePacketCreator.requestPinAfterFailure());
c.announce(PacketCreator.requestPinAfterFailure());
}
} else if (c2 == 2 && c3 == 0) {
String pin = slea.readMapleAsciiString();
if (c.checkPin(pin)) {
c.announce(MaplePacketCreator.registerPin());
c.announce(PacketCreator.registerPin());
} else {
c.announce(MaplePacketCreator.requestPinAfterFailure());
c.announce(PacketCreator.requestPinAfterFailure());
}
} else if (c2 == 0 && c3 == 5) {
SessionCoordinator.getInstance().closeSession(c, null);

12
src/main/java/net/server/handlers/login/CharSelectedHandler.java
View File

@@ -30,7 +30,7 @@ import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult;
import net.server.world.World;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import java.net.InetAddress;
@@ -61,7 +61,7 @@ public final class CharSelectedHandler extends AbstractMaplePacketHandler {
hwid = Hwid.fromHostString(hostString);
} catch (IllegalArgumentException e) {
log.warn("Invalid host string: {}", hostString, e);
c.announce(MaplePacketCreator.getAfterLoginError(17));
c.announce(PacketCreator.getAfterLoginError(17));
return;
}
@@ -70,7 +70,7 @@ public final class CharSelectedHandler extends AbstractMaplePacketHandler {
AntiMulticlientResult res = SessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid);
if (res != AntiMulticlientResult.SUCCESS) {
c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res)));
c.announce(PacketCreator.getAfterLoginError(parseAntiMulticlientError(res)));
return;
}
@@ -88,13 +88,13 @@ public final class CharSelectedHandler extends AbstractMaplePacketHandler {
c.setWorld(server.getCharacterWorld(charId));
World wserv = c.getWorldServer();
if(wserv == null || wserv.isWorldCapacityFull()) {
c.announce(MaplePacketCreator.getAfterLoginError(10));
c.announce(PacketCreator.getAfterLoginError(10));
return;
}
String[] socket = server.getInetSocket(c, c.getWorld(), c.getChannel());
if(socket == null) {
c.announce(MaplePacketCreator.getAfterLoginError(10));
c.announce(PacketCreator.getAfterLoginError(10));
return;
}
@@ -102,7 +102,7 @@ public final class CharSelectedHandler extends AbstractMaplePacketHandler {
c.setCharacterOnSessionTransitionState(charId);
try {
c.announce(MaplePacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId));
c.announce(PacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId));
} catch (UnknownHostException | NumberFormatException e) {
e.printStackTrace();
}

14
src/main/java/net/server/handlers/login/CharSelectedWithPicHandler.java
View File

@@ -9,7 +9,7 @@ import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult;
import net.server.world.World;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import java.net.InetAddress;
@@ -41,7 +41,7 @@ public class CharSelectedWithPicHandler extends AbstractMaplePacketHandler {
hwid = Hwid.fromHostString(hostString);
} catch (IllegalArgumentException e) {
log.warn("Invalid host string: {}", hostString, e);
c.announce(MaplePacketCreator.getAfterLoginError(17));
c.announce(PacketCreator.getAfterLoginError(17));
return;
}
@@ -63,19 +63,19 @@ public class CharSelectedWithPicHandler extends AbstractMaplePacketHandler {
c.setWorld(server.getCharacterWorld(charId));
World wserv = c.getWorldServer();
if(wserv == null || wserv.isWorldCapacityFull()) {
c.announce(MaplePacketCreator.getAfterLoginError(10));
c.announce(PacketCreator.getAfterLoginError(10));
return;
}
String[] socket = server.getInetSocket(c, c.getWorld(), c.getChannel());
if(socket == null) {
c.announce(MaplePacketCreator.getAfterLoginError(10));
c.announce(PacketCreator.getAfterLoginError(10));
return;
}
AntiMulticlientResult res = SessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid);
if (res != AntiMulticlientResult.SUCCESS) {
c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res)));
c.announce(PacketCreator.getAfterLoginError(parseAntiMulticlientError(res)));
return;
}
@@ -83,12 +83,12 @@ public class CharSelectedWithPicHandler extends AbstractMaplePacketHandler {
c.setCharacterOnSessionTransitionState(charId);
try {
c.announce(MaplePacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId));
c.announce(PacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId));
} catch (UnknownHostException | NumberFormatException e) {
e.printStackTrace();
}
} else {
c.announce(MaplePacketCreator.wrongPic());
c.announce(PacketCreator.wrongPic());
}
}
}

6
src/main/java/net/server/handlers/login/CharlistRequestHandler.java
View File

@@ -26,7 +26,7 @@ import net.AbstractMaplePacketHandler;
import net.server.Server;
import net.server.channel.Channel;
import net.server.world.World;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
public final class CharlistRequestHandler extends AbstractMaplePacketHandler {
@@ -38,14 +38,14 @@ public final class CharlistRequestHandler extends AbstractMaplePacketHandler {
World wserv = Server.getInstance().getWorld(world);
if(wserv == null || wserv.isWorldCapacityFull()) {
c.announce(MaplePacketCreator.getServerStatus(2));
c.announce(PacketCreator.getServerStatus(2));
return;
}
int channel = slea.readByte() + 1;
Channel ch = wserv.getChannel(channel);
if(ch == null) {
c.announce(MaplePacketCreator.getServerStatus(2));
c.announce(PacketCreator.getServerStatus(2));
return;
}

4
src/main/java/net/server/handlers/login/CheckCharNameHandler.java
View File

@@ -24,7 +24,7 @@ package net.server.handlers.login;
import client.MapleCharacter;
import client.MapleClient;
import net.AbstractMaplePacketHandler;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
public final class CheckCharNameHandler extends AbstractMaplePacketHandler {
@@ -32,6 +32,6 @@ public final class CheckCharNameHandler extends AbstractMaplePacketHandler {
@Override
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
String name = slea.readMapleAsciiString();
c.announce(MaplePacketCreator.charNameResponse(name, !MapleCharacter.canCreateChar(name)));
c.announce(PacketCreator.charNameResponse(name, !MapleCharacter.canCreateChar(name)));
}
}

6
src/main/java/net/server/handlers/login/CreateCharHandler.java
View File

@@ -27,7 +27,7 @@ import client.creator.novice.LegendCreator;
import client.creator.novice.NoblesseCreator;
import net.AbstractMaplePacketHandler;
import tools.FilePrinter;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import java.util.Arrays;
@@ -84,12 +84,12 @@ public final class CreateCharHandler extends AbstractMaplePacketHandler {
} else if (job == 2) { // Aran
status = LegendCreator.createCharacter(c, name, face, hair + haircolor, skincolor, top, bottom, shoes, weapon, gender);
} else {
c.announce(MaplePacketCreator.deleteCharResponse(0, 9));
c.announce(PacketCreator.deleteCharResponse(0, 9));
return;
}
if (status == -2) {
c.announce(MaplePacketCreator.deleteCharResponse(0, 9));
c.announce(PacketCreator.deleteCharResponse(0, 9));
}
}
}

16
src/main/java/net/server/handlers/login/DeleteCharHandler.java
View File

@@ -27,7 +27,7 @@ import net.AbstractMaplePacketHandler;
import net.server.Server;
import tools.DatabaseConnection;
import tools.FilePrinter;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import java.sql.Connection;
@@ -57,12 +57,12 @@ public final class DeleteCharHandler extends AbstractMaplePacketHandler {
int guildRank = rs.getInt("guildrank");
int familyId = rs.getInt("familyId");
if (guildId != 0 && guildRank <= 1) {
c.announce(MaplePacketCreator.deleteCharResponse(cid, 0x16));
c.announce(PacketCreator.deleteCharResponse(cid, 0x16));
return;
} else if (familyId != -1) {
MapleFamily family = Server.getInstance().getWorld(world).getFamily(familyId);
if (family != null && family.getTotalMembers() > 1) {
c.announce(MaplePacketCreator.deleteCharResponse(cid, 0x1D));
c.announce(PacketCreator.deleteCharResponse(cid, 0x1D));
return;
}
}
@@ -72,23 +72,23 @@ public final class DeleteCharHandler extends AbstractMaplePacketHandler {
try (ResultSet rs = ps2.executeQuery()) {
rs.next();
if (rs.getInt("rowcount") > 0) {
c.announce(MaplePacketCreator.deleteCharResponse(cid, 0x1A));
c.announce(PacketCreator.deleteCharResponse(cid, 0x1A));
return;
}
}
} catch (SQLException e) {
e.printStackTrace();
c.announce(MaplePacketCreator.deleteCharResponse(cid, 0x09));
c.announce(PacketCreator.deleteCharResponse(cid, 0x09));
return;
}
if (c.deleteCharacter(cid, c.getAccID())) {
FilePrinter.print(FilePrinter.DELETED_CHAR + c.getAccountName() + ".txt", c.getAccountName() + " deleted CID: " + cid);
c.announce(MaplePacketCreator.deleteCharResponse(cid, 0));
c.announce(PacketCreator.deleteCharResponse(cid, 0));
} else {
c.announce(MaplePacketCreator.deleteCharResponse(cid, 0x09));
c.announce(PacketCreator.deleteCharResponse(cid, 0x09));
}
} else {
c.announce(MaplePacketCreator.deleteCharResponse(cid, 0x14));
c.announce(PacketCreator.deleteCharResponse(cid, 0x14));
}
}
}

4
src/main/java/net/server/handlers/login/GuestLoginHandler.java
View File

@@ -23,7 +23,7 @@ package net.server.handlers.login;
import client.MapleClient;
import net.AbstractMaplePacketHandler;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
/*
@@ -33,7 +33,7 @@ public final class GuestLoginHandler extends AbstractMaplePacketHandler {
@Override
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
c.announce(MaplePacketCreator.sendGuestTOS());
c.announce(PacketCreator.sendGuestTOS());
//System.out.println(slea.toString());
new LoginPasswordHandler().handlePacket(slea, c);
}

16
src/main/java/net/server/handlers/login/LoginPasswordHandler.java
View File

@@ -30,7 +30,7 @@ import net.server.coordinator.session.Hwid;
import tools.BCrypt;
import tools.DatabaseConnection;
import tools.HexTool;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import java.io.UnsupportedEncodingException;
@@ -57,7 +57,7 @@ public final class LoginPasswordHandler implements MaplePacketHandler {
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
String remoteHost = c.getRemoteAddress();
if (remoteHost.contentEquals("null")) {
c.announce(MaplePacketCreator.getLoginFailed(14)); // thanks Alchemist for noting remoteHost could be null
c.announce(PacketCreator.getLoginFailed(14)); // thanks Alchemist for noting remoteHost could be null
return;
}
@@ -106,33 +106,33 @@ public final class LoginPasswordHandler implements MaplePacketHandler {
}
if (c.hasBannedIP() || c.hasBannedMac()) {
c.announce(MaplePacketCreator.getLoginFailed(3));
c.announce(PacketCreator.getLoginFailed(3));
return;
}
Calendar tempban = c.getTempBanCalendarFromDB();
if (tempban != null) {
if (tempban.getTimeInMillis() > Calendar.getInstance().getTimeInMillis()) {
c.announce(MaplePacketCreator.getTempBan(tempban.getTimeInMillis(), c.getGReason()));
c.announce(PacketCreator.getTempBan(tempban.getTimeInMillis(), c.getGReason()));
return;
}
}
if (loginok == 3) {
c.announce(MaplePacketCreator.getPermBan(c.getGReason()));//crashes but idc :D
c.announce(PacketCreator.getPermBan(c.getGReason()));//crashes but idc :D
return;
} else if (loginok != 0) {
c.announce(MaplePacketCreator.getLoginFailed(loginok));
c.announce(PacketCreator.getLoginFailed(loginok));
return;
}
if (c.finishLogin() == 0) {
c.checkChar(c.getAccID());
login(c);
} else {
c.announce(MaplePacketCreator.getLoginFailed(7));
c.announce(PacketCreator.getLoginFailed(7));
}
}
private static void login(MapleClient c) {
c.announce(MaplePacketCreator.getAuthSuccess(c));//why the fk did I do c.getAccountName()?
c.announce(PacketCreator.getAuthSuccess(c));//why the fk did I do c.getAccountName()?
Server.getInstance().registerLoginState(c);
}
}

12
src/main/java/net/server/handlers/login/RegisterPicHandler.java
View File

@@ -9,7 +9,7 @@ import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult;
import net.server.world.World;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import java.net.InetAddress;
@@ -41,7 +41,7 @@ public final class RegisterPicHandler extends AbstractMaplePacketHandler {
hwid = Hwid.fromHostString(hostString);
} catch (IllegalArgumentException e) {
log.warn("Invalid host string: {}", hostString, e);
c.announce(MaplePacketCreator.getAfterLoginError(17));
c.announce(PacketCreator.getAfterLoginError(17));
return;
}
@@ -50,7 +50,7 @@ public final class RegisterPicHandler extends AbstractMaplePacketHandler {
AntiMulticlientResult res = SessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid);
if (res != AntiMulticlientResult.SUCCESS) {
c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res)));
c.announce(PacketCreator.getAfterLoginError(parseAntiMulticlientError(res)));
return;
}
@@ -72,13 +72,13 @@ public final class RegisterPicHandler extends AbstractMaplePacketHandler {
c.setWorld(server.getCharacterWorld(charId));
World wserv = c.getWorldServer();
if(wserv == null || wserv.isWorldCapacityFull()) {
c.announce(MaplePacketCreator.getAfterLoginError(10));
c.announce(PacketCreator.getAfterLoginError(10));
return;
}
String[] socket = server.getInetSocket(c, c.getWorld(), c.getChannel());
if(socket == null) {
c.announce(MaplePacketCreator.getAfterLoginError(10));
c.announce(PacketCreator.getAfterLoginError(10));
return;
}
@@ -86,7 +86,7 @@ public final class RegisterPicHandler extends AbstractMaplePacketHandler {
c.setCharacterOnSessionTransitionState(charId);
try {
c.announce(MaplePacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId));
c.announce(PacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId));
} catch (UnknownHostException e) {
e.printStackTrace();
}

4
src/main/java/net/server/handlers/login/RegisterPinHandler.java
View File

@@ -24,7 +24,7 @@ package net.server.handlers.login;
import client.MapleClient;
import net.AbstractMaplePacketHandler;
import net.server.coordinator.session.SessionCoordinator;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
/*
@@ -41,7 +41,7 @@ public final class RegisterPinHandler extends AbstractMaplePacketHandler {
String pin = slea.readMapleAsciiString();
if (pin != null) {
c.setPin(pin);
c.announce(MaplePacketCreator.pinRegistered());
c.announce(PacketCreator.pinRegistered());
SessionCoordinator.getInstance().closeSession(c, null);
c.updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN);

4
src/main/java/net/server/handlers/login/RelogRequestHandler.java
View File

@@ -23,7 +23,7 @@ package net.server.handlers.login;
import client.MapleClient;
import net.AbstractMaplePacketHandler;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
public final class RelogRequestHandler extends AbstractMaplePacketHandler {
@@ -34,6 +34,6 @@ public final class RelogRequestHandler extends AbstractMaplePacketHandler {
@Override
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
c.announce(MaplePacketCreator.getRelogResponse());
c.announce(PacketCreator.getRelogResponse());
}
}

8
src/main/java/net/server/handlers/login/ServerStatusRequestHandler.java
View File

@@ -23,9 +23,9 @@ package net.server.handlers.login;
import client.MapleClient;
import net.AbstractMaplePacketHandler;
import net.server.world.World;
import net.server.Server;
import tools.MaplePacketCreator;
import net.server.world.World;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
public final class ServerStatusRequestHandler extends AbstractMaplePacketHandler {
@@ -36,9 +36,9 @@ public final class ServerStatusRequestHandler extends AbstractMaplePacketHandler
World wserv = Server.getInstance().getWorld(world);
if(wserv != null) {
int status = wserv.getWorldCapacityStatus();
c.announce(MaplePacketCreator.getServerStatus(status));
c.announce(PacketCreator.getServerStatus(status));
} else {
c.announce(MaplePacketCreator.getServerStatus(2));
c.announce(PacketCreator.getServerStatus(2));
}
}
}

13
src/main/java/net/server/handlers/login/ServerlistRequestHandler.java
View File

@@ -23,13 +23,14 @@ package net.server.handlers.login;
import client.MapleClient;
import constants.game.GameConstants;
import java.util.List;
import net.AbstractMaplePacketHandler;
import net.server.Server;
import net.server.world.World;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import java.util.List;
public final class ServerlistRequestHandler extends AbstractMaplePacketHandler {
@Override
@@ -39,10 +40,10 @@ public final class ServerlistRequestHandler extends AbstractMaplePacketHandler {
c.requestedServerlist(worlds.size());
for (World world : worlds) {
c.announce(MaplePacketCreator.getServerList(world.getId(), GameConstants.WORLD_NAMES[world.getId()], world.getFlag(), world.getEventMessage(), world.getChannels()));
c.announce(PacketCreator.getServerList(world.getId(), GameConstants.WORLD_NAMES[world.getId()], world.getFlag(), world.getEventMessage(), world.getChannels()));
}
c.announce(MaplePacketCreator.getEndOfServerList());
c.announce(MaplePacketCreator.selectWorld(0));//too lazy to make a check lol
c.announce(MaplePacketCreator.sendRecommended(server.worldRecommendedList()));
c.announce(PacketCreator.getEndOfServerList());
c.announce(PacketCreator.selectWorld(0));//too lazy to make a check lol
c.announce(PacketCreator.sendRecommended(server.worldRecommendedList()));
}
}

4
src/main/java/net/server/handlers/login/SetGenderHandler.java
View File

@@ -26,7 +26,7 @@ import client.MapleClient;
import net.AbstractMaplePacketHandler;
import net.server.Server;
import net.server.coordinator.session.SessionCoordinator;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
/**
@@ -40,7 +40,7 @@ public class SetGenderHandler extends AbstractMaplePacketHandler {
byte confirmed = slea.readByte();
if (confirmed == 0x01) {
c.setGender(slea.readByte());
c.announce(MaplePacketCreator.getAuthSuccess(c));
c.announce(PacketCreator.getAuthSuccess(c));
Server.getInstance().registerLoginState(c);
} else {

13
src/main/java/net/server/handlers/login/ViewAllCharHandler.java
View File

@@ -24,19 +24,20 @@ package net.server.handlers.login;
import client.MapleCharacter;
import client.MapleClient;
import config.YamlConfig;
import java.util.List;
import net.AbstractMaplePacketHandler;
import net.server.Server;
import tools.MaplePacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
import tools.PacketCreator;
import tools.Pair;
import tools.data.input.SeekableLittleEndianAccessor;
import java.util.List;
public final class ViewAllCharHandler extends AbstractMaplePacketHandler {
@Override
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
try {
if(!c.canRequestCharlist()) { // client breaks if the charlist request pops too soon
c.announce(MaplePacketCreator.showAllCharacter(0, 0));
c.announce(PacketCreator.showAllCharacter(0, 0));
return;
}
@@ -61,10 +62,10 @@ public final class ViewAllCharHandler extends AbstractMaplePacketHandler {
int charsSize = chrTotal;
int unk = charsSize + (3 - charsSize % 3); //rowSize?
c.announce(MaplePacketCreator.showAllCharacter(charsSize, unk));
c.announce(PacketCreator.showAllCharacter(charsSize, unk));
for (Pair<Integer, List<MapleCharacter>> wchars : worldChars) {
c.announce(MaplePacketCreator.showAllCharacterInfo(wchars.getLeft(), wchars.getRight(), YamlConfig.config.server.ENABLE_PIC && !c.canBypassPic()));
c.announce(PacketCreator.showAllCharacterInfo(wchars.getLeft(), wchars.getRight(), YamlConfig.config.server.ENABLE_PIC && !c.canBypassPic()));
}
} catch (Exception e) {
e.printStackTrace();

12
src/main/java/net/server/handlers/login/ViewAllCharRegisterPicHandler.java
View File

@@ -9,7 +9,7 @@ import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult;
import net.server.world.World;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Randomizer;
import tools.data.input.SeekableLittleEndianAccessor;
@@ -43,7 +43,7 @@ public final class ViewAllCharRegisterPicHandler extends AbstractMaplePacketHand
hwid = Hwid.fromHostString(hostString);
} catch (IllegalArgumentException e) {
log.warn("Invalid host string: {}", hostString, e);
c.announce(MaplePacketCreator.getAfterLoginError(17));
c.announce(PacketCreator.getAfterLoginError(17));
return;
}
@@ -57,7 +57,7 @@ public final class ViewAllCharRegisterPicHandler extends AbstractMaplePacketHand
AntiMulticlientResult res = SessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid);
if (res != AntiMulticlientResult.SUCCESS) {
c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res)));
c.announce(PacketCreator.getAfterLoginError(parseAntiMulticlientError(res)));
return;
}
@@ -70,7 +70,7 @@ public final class ViewAllCharRegisterPicHandler extends AbstractMaplePacketHand
c.setWorld(server.getCharacterWorld(charId));
World wserv = c.getWorldServer();
if(wserv == null || wserv.isWorldCapacityFull()) {
c.announce(MaplePacketCreator.getAfterLoginError(10));
c.announce(PacketCreator.getAfterLoginError(10));
return;
}
@@ -82,7 +82,7 @@ public final class ViewAllCharRegisterPicHandler extends AbstractMaplePacketHand
String[] socket = server.getInetSocket(c, c.getWorld(), channel);
if (socket == null) {
c.announce(MaplePacketCreator.getAfterLoginError(10));
c.announce(PacketCreator.getAfterLoginError(10));
return;
}
@@ -90,7 +90,7 @@ public final class ViewAllCharRegisterPicHandler extends AbstractMaplePacketHand
c.setCharacterOnSessionTransitionState(charId);
try {
c.announce(MaplePacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId));
c.announce(PacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId));
} catch (UnknownHostException e) {
e.printStackTrace();
}

12
src/main/java/net/server/handlers/login/ViewAllCharSelectedHandler.java
View File

@@ -30,7 +30,7 @@ import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult;
import net.server.world.World;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Randomizer;
import tools.data.input.SeekableLittleEndianAccessor;
@@ -63,7 +63,7 @@ public final class ViewAllCharSelectedHandler extends AbstractMaplePacketHandler
hwid = Hwid.fromHostString(hostString);
} catch (IllegalArgumentException e) {
log.warn("Invalid host string: {}", hostString, e);
c.announce(MaplePacketCreator.getAfterLoginError(17));
c.announce(PacketCreator.getAfterLoginError(17));
return;
}
@@ -77,7 +77,7 @@ public final class ViewAllCharSelectedHandler extends AbstractMaplePacketHandler
AntiMulticlientResult res = SessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid);
if (res != AntiMulticlientResult.SUCCESS) {
c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res)));
c.announce(PacketCreator.getAfterLoginError(parseAntiMulticlientError(res)));
return;
}
@@ -91,7 +91,7 @@ public final class ViewAllCharSelectedHandler extends AbstractMaplePacketHandler
World wserv = c.getWorldServer();
if(wserv == null || wserv.isWorldCapacityFull()) {
c.announce(MaplePacketCreator.getAfterLoginError(10));
c.announce(PacketCreator.getAfterLoginError(10));
return;
}
@@ -105,7 +105,7 @@ public final class ViewAllCharSelectedHandler extends AbstractMaplePacketHandler
String[] socket = server.getInetSocket(c, c.getWorld(), c.getChannel());
if(socket == null) {
c.announce(MaplePacketCreator.getAfterLoginError(10));
c.announce(PacketCreator.getAfterLoginError(10));
return;
}
@@ -113,7 +113,7 @@ public final class ViewAllCharSelectedHandler extends AbstractMaplePacketHandler
c.setCharacterOnSessionTransitionState(charId);
try {
c.announce(MaplePacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId));
c.announce(PacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId));
} catch (UnknownHostException e) {
e.printStackTrace();
}

14
src/main/java/net/server/handlers/login/ViewAllCharSelectedWithPicHandler.java
View File

@@ -9,7 +9,7 @@ import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult;
import net.server.world.World;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Randomizer;
import tools.data.input.SeekableLittleEndianAccessor;
@@ -44,7 +44,7 @@ public class ViewAllCharSelectedWithPicHandler extends AbstractMaplePacketHandle
hwid = Hwid.fromHostString(hostString);
} catch (IllegalArgumentException e) {
log.warn("Invalid host string: {}", hostString, e);
c.announce(MaplePacketCreator.getAfterLoginError(17));
c.announce(PacketCreator.getAfterLoginError(17));
return;
}
@@ -65,7 +65,7 @@ public class ViewAllCharSelectedWithPicHandler extends AbstractMaplePacketHandle
c.setWorld(server.getCharacterWorld(charId));
World wserv = c.getWorldServer();
if(wserv == null || wserv.isWorldCapacityFull()) {
c.announce(MaplePacketCreator.getAfterLoginError(10));
c.announce(PacketCreator.getAfterLoginError(10));
return;
}
@@ -75,13 +75,13 @@ public class ViewAllCharSelectedWithPicHandler extends AbstractMaplePacketHandle
if (c.checkPic(pic)) {
String[] socket = server.getInetSocket(c, c.getWorld(), c.getChannel());
if(socket == null) {
c.announce(MaplePacketCreator.getAfterLoginError(10));
c.announce(PacketCreator.getAfterLoginError(10));
return;
}
AntiMulticlientResult res = SessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid);
if (res != AntiMulticlientResult.SUCCESS) {
c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res)));
c.announce(PacketCreator.getAfterLoginError(parseAntiMulticlientError(res)));
return;
}
@@ -89,13 +89,13 @@ public class ViewAllCharSelectedWithPicHandler extends AbstractMaplePacketHandle
c.setCharacterOnSessionTransitionState(charId);
try {
c.announce(MaplePacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId));
c.announce(PacketCreator.getServerIP(InetAddress.getByName(socket[0]), Integer.parseInt(socket[1]), charId));
} catch (UnknownHostException e) {
e.printStackTrace();
}
} else {
c.announce(MaplePacketCreator.wrongPic());
c.announce(PacketCreator.wrongPic());
}
}
}