From 8c4d3092a7c1a24d6ce6384132ba78edf45fde7d Mon Sep 17 00:00:00 2001 From: P0nk Date: Wed, 18 Aug 2021 15:47:01 +0200 Subject: [PATCH] Remove "Maple" prefix from MapleSessionCoordinator name --- src/main/java/client/MapleClient.java | 22 +++++++++---------- .../commands/gm5/ShowSessionsCommand.java | 4 ++-- .../net/netty/ChannelServerInitializer.java | 4 ++-- .../net/netty/LoginServerInitializer.java | 4 ++-- src/main/java/net/server/Server.java | 6 ++--- .../handlers/PlayerLoggedinHandler.java | 4 ++-- .../session/InitializationResult.java | 2 +- ...ordinator.java => SessionCoordinator.java} | 12 +++++----- .../handlers/login/AfterLoginHandler.java | 4 ++-- .../handlers/login/CharSelectedHandler.java | 10 ++++----- .../login/CharSelectedWithPicHandler.java | 10 ++++----- .../handlers/login/RegisterPicHandler.java | 12 +++++----- .../handlers/login/RegisterPinHandler.java | 6 ++--- .../handlers/login/SetGenderHandler.java | 4 ++-- .../login/ViewAllCharRegisterPicHandler.java | 10 ++++----- .../login/ViewAllCharSelectedHandler.java | 10 ++++----- .../ViewAllCharSelectedWithPicHandler.java | 10 ++++----- .../net/server/task/LoginCoordinatorTask.java | 4 ++-- .../net/server/task/LoginStorageTask.java | 4 ++-- 19 files changed, 71 insertions(+), 71 deletions(-) rename src/main/java/net/server/coordinator/session/{MapleSessionCoordinator.java => SessionCoordinator.java} (97%) diff --git a/src/main/java/client/MapleClient.java b/src/main/java/client/MapleClient.java index 582dd99758..4d72ec87ba 100644 --- a/src/main/java/client/MapleClient.java +++ b/src/main/java/client/MapleClient.java @@ -42,8 +42,8 @@ import net.server.channel.Channel; import net.server.coordinator.login.MapleLoginBypassCoordinator; import net.server.coordinator.session.Hwid; import net.server.coordinator.session.IpAddresses; -import net.server.coordinator.session.MapleSessionCoordinator; -import net.server.coordinator.session.MapleSessionCoordinator.AntiMulticlientResult; +import net.server.coordinator.session.SessionCoordinator; +import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult; import net.server.guild.MapleGuild; import net.server.guild.MapleGuildCharacter; import net.server.world.*; @@ -229,7 +229,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { } if (cause instanceof InvalidPacketHeaderException) { - MapleSessionCoordinator.getInstance().closeSession(this, true); + SessionCoordinator.getInstance().closeSession(this, true); } else if (cause instanceof IOException) { closeMapleSession(); } @@ -242,8 +242,8 @@ public class MapleClient extends ChannelInboundHandlerAdapter { private void closeMapleSession() { switch (type) { - case LOGIN -> MapleSessionCoordinator.getInstance().closeLoginSession(this); - case CHANNEL -> MapleSessionCoordinator.getInstance().closeSession(this, null); + case LOGIN -> SessionCoordinator.getInstance().closeLoginSession(this); + case CHANNEL -> SessionCoordinator.getInstance().closeSession(this, null); } try { @@ -580,7 +580,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { pinattempt++; if (pinattempt > 5) { - MapleSessionCoordinator.getInstance().closeSession(this, false); + SessionCoordinator.getInstance().closeSession(this, false); } if (pin.equals(other)) { pinattempt = 0; @@ -613,7 +613,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { picattempt++; if (picattempt > 5) { - MapleSessionCoordinator.getInstance().closeSession(this, false); + SessionCoordinator.getInstance().closeSession(this, false); } if (pic.equals(other)) { // thanks ryantpayton (HeavenClient) for noticing null pics being checked here picattempt = 0; @@ -629,7 +629,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { loginattempt++; if (loginattempt > 4) { loggedIn = false; - MapleSessionCoordinator.getInstance().closeSession(this, false); + SessionCoordinator.getInstance().closeSession(this, false); return 6; // thanks Survival_Project for finding out an issue with AUTOMATIC_REGISTER here } @@ -681,7 +681,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { } if (loginok == 0 || loginok == 4) { - AntiMulticlientResult res = MapleSessionCoordinator.getInstance().attemptLoginSession(this, hwid, accId, loginok == 4); + AntiMulticlientResult res = SessionCoordinator.getInstance().attemptLoginSession(this, hwid, accId, loginok == 4); switch (res) { case SUCCESS: @@ -807,7 +807,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { public void updateLoginState(int newState) { // rules out possibility of multiple account entries if (newState == LOGIN_LOGGEDIN) { - MapleSessionCoordinator.getInstance().updateOnlineClient(this); + SessionCoordinator.getInstance().updateOnlineClient(this); } try (Connection con = DatabaseConnection.getConnection(); @@ -1042,7 +1042,7 @@ public class MapleClient extends ChannelInboundHandlerAdapter { } } - MapleSessionCoordinator.getInstance().closeSession(this, false); + SessionCoordinator.getInstance().closeSession(this, false); if (!serverTransition && isLoggedIn()) { updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN); diff --git a/src/main/java/client/command/commands/gm5/ShowSessionsCommand.java b/src/main/java/client/command/commands/gm5/ShowSessionsCommand.java index 40ed9ed114..71d31c9982 100644 --- a/src/main/java/client/command/commands/gm5/ShowSessionsCommand.java +++ b/src/main/java/client/command/commands/gm5/ShowSessionsCommand.java @@ -21,7 +21,7 @@ package client.command.commands.gm5; import client.MapleClient; import client.command.Command; -import net.server.coordinator.session.MapleSessionCoordinator; +import net.server.coordinator.session.SessionCoordinator; /** * @@ -34,6 +34,6 @@ public class ShowSessionsCommand extends Command { @Override public void execute(MapleClient c, String[] params) { - MapleSessionCoordinator.getInstance().printSessionTrace(c); + SessionCoordinator.getInstance().printSessionTrace(c); } } diff --git a/src/main/java/net/netty/ChannelServerInitializer.java b/src/main/java/net/netty/ChannelServerInitializer.java index 13f3aff181..a4a64c15ce 100644 --- a/src/main/java/net/netty/ChannelServerInitializer.java +++ b/src/main/java/net/netty/ChannelServerInitializer.java @@ -4,7 +4,7 @@ import client.MapleClient; import io.netty.channel.socket.SocketChannel; import net.PacketProcessor; import net.server.Server; -import net.server.coordinator.session.MapleSessionCoordinator; +import net.server.coordinator.session.SessionCoordinator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +30,7 @@ public class ChannelServerInitializer extends ServerChannelInitializer { final MapleClient client = MapleClient.createChannelClient(clientSessionId, remoteAddress, packetProcessor, world, channel); if (Server.getInstance().getChannel(world, channel) == null) { - MapleSessionCoordinator.getInstance().closeSession(client, true); + SessionCoordinator.getInstance().closeSession(client, true); socketChannel.close(); return; } diff --git a/src/main/java/net/netty/LoginServerInitializer.java b/src/main/java/net/netty/LoginServerInitializer.java index 5294e5ead1..f4ada797b1 100644 --- a/src/main/java/net/netty/LoginServerInitializer.java +++ b/src/main/java/net/netty/LoginServerInitializer.java @@ -3,7 +3,7 @@ package net.netty; import client.MapleClient; import io.netty.channel.socket.SocketChannel; import net.PacketProcessor; -import net.server.coordinator.session.MapleSessionCoordinator; +import net.server.coordinator.session.SessionCoordinator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,7 +20,7 @@ public class LoginServerInitializer extends ServerChannelInitializer { final String remoteAddress = getRemoteAddress(socketChannel); final MapleClient client = MapleClient.createLoginClient(clientSessionId, remoteAddress, packetProcessor, LoginServer.WORLD_ID, LoginServer.CHANNEL_ID); - if (!MapleSessionCoordinator.getInstance().canStartLoginSession(client)) { + if (!SessionCoordinator.getInstance().canStartLoginSession(client)) { socketChannel.close(); return; } diff --git a/src/main/java/net/server/Server.java b/src/main/java/net/server/Server.java index fe515cef9c..b64eaa2daf 100644 --- a/src/main/java/net/server/Server.java +++ b/src/main/java/net/server/Server.java @@ -46,7 +46,7 @@ import net.server.audit.locks.factory.MonitoredReentrantLockFactory; import net.server.audit.locks.factory.MonitoredWriteLockFactory; import net.server.channel.Channel; import net.server.coordinator.session.IpAddresses; -import net.server.coordinator.session.MapleSessionCoordinator; +import net.server.coordinator.session.SessionCoordinator; import net.server.guild.MapleAlliance; import net.server.guild.MapleGuild; import net.server.guild.MapleGuildCharacter; @@ -1764,7 +1764,7 @@ public class Server { } private static String getRemoteHost(MapleClient client) { - return MapleSessionCoordinator.getSessionRemoteHost(client); + return SessionCoordinator.getSessionRemoteHost(client); } public void setCharacteridInTransition(MapleClient client, int charId) { @@ -1866,7 +1866,7 @@ public class Server { if (c.isLoggedIn()) { c.disconnect(false, false); } else { - MapleSessionCoordinator.getInstance().closeSession(c, true); + SessionCoordinator.getInstance().closeSession(c, true); } } } diff --git a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java index 328e40d7ee..dfa22824e4 100644 --- a/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java +++ b/src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java @@ -32,7 +32,7 @@ import net.server.Server; import net.server.channel.Channel; import net.server.channel.CharacterIdChannelPair; import net.server.coordinator.session.Hwid; -import net.server.coordinator.session.MapleSessionCoordinator; +import net.server.coordinator.session.SessionCoordinator; import net.server.coordinator.world.MapleEventRecallCoordinator; import net.server.guild.MapleAlliance; import net.server.guild.MapleGuild; @@ -114,7 +114,7 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler { final Hwid hwid; if (player == null) { - hwid = MapleSessionCoordinator.getInstance().pickLoginSessionHwid(c); + hwid = SessionCoordinator.getInstance().pickLoginSessionHwid(c); if (hwid == null) { c.disconnect(true, false); return; diff --git a/src/main/java/net/server/coordinator/session/InitializationResult.java b/src/main/java/net/server/coordinator/session/InitializationResult.java index dc18ef502c..3c6f596dfa 100644 --- a/src/main/java/net/server/coordinator/session/InitializationResult.java +++ b/src/main/java/net/server/coordinator/session/InitializationResult.java @@ -1,6 +1,6 @@ package net.server.coordinator.session; -import net.server.coordinator.session.MapleSessionCoordinator.AntiMulticlientResult; +import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult; enum InitializationResult { SUCCESS(AntiMulticlientResult.SUCCESS), diff --git a/src/main/java/net/server/coordinator/session/MapleSessionCoordinator.java b/src/main/java/net/server/coordinator/session/SessionCoordinator.java similarity index 97% rename from src/main/java/net/server/coordinator/session/MapleSessionCoordinator.java rename to src/main/java/net/server/coordinator/session/SessionCoordinator.java index 39b7a67358..5a266383e9 100644 --- a/src/main/java/net/server/coordinator/session/MapleSessionCoordinator.java +++ b/src/main/java/net/server/coordinator/session/SessionCoordinator.java @@ -40,11 +40,11 @@ import java.util.stream.Collectors; * * @author Ronan */ -public class MapleSessionCoordinator { - private static final Logger log = LoggerFactory.getLogger(MapleSessionCoordinator.class); - private static final MapleSessionCoordinator instance = new MapleSessionCoordinator(); +public class SessionCoordinator { + private static final Logger log = LoggerFactory.getLogger(SessionCoordinator.class); + private static final SessionCoordinator instance = new SessionCoordinator(); - public static MapleSessionCoordinator getInstance() { + public static SessionCoordinator getInstance() { return instance; } @@ -65,7 +65,7 @@ public class MapleSessionCoordinator { private final Map loginRemoteHosts = new ConcurrentHashMap<>(); // Key: Ip (+ nibblehwid) private final HostHwidCache hostHwidCache = new HostHwidCache(); - private MapleSessionCoordinator() { + private SessionCoordinator() { } private static boolean attemptAccountAccess(int accountId, Hwid hwid, boolean routineCheck) { @@ -269,7 +269,7 @@ public class MapleSessionCoordinator { } private static MapleClient fetchInTransitionSessionClient(MapleClient client) { - Hwid hwid = MapleSessionCoordinator.getInstance().getGameSessionHwid(client); + Hwid hwid = SessionCoordinator.getInstance().getGameSessionHwid(client); if (hwid == null) { // maybe this session was currently in-transition? return null; } diff --git a/src/main/java/net/server/handlers/login/AfterLoginHandler.java b/src/main/java/net/server/handlers/login/AfterLoginHandler.java index 1364367a3d..2a4b306665 100644 --- a/src/main/java/net/server/handlers/login/AfterLoginHandler.java +++ b/src/main/java/net/server/handlers/login/AfterLoginHandler.java @@ -23,7 +23,7 @@ package net.server.handlers.login; import client.MapleClient; import net.AbstractMaplePacketHandler; -import net.server.coordinator.session.MapleSessionCoordinator; +import net.server.coordinator.session.SessionCoordinator; import tools.MaplePacketCreator; import tools.data.input.SeekableLittleEndianAccessor; @@ -57,7 +57,7 @@ public final class AfterLoginHandler extends AbstractMaplePacketHandler { c.announce(MaplePacketCreator.requestPinAfterFailure()); } } else if (c2 == 0 && c3 == 5) { - MapleSessionCoordinator.getInstance().closeSession(c, null); + SessionCoordinator.getInstance().closeSession(c, null); c.updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN); } } diff --git a/src/main/java/net/server/handlers/login/CharSelectedHandler.java b/src/main/java/net/server/handlers/login/CharSelectedHandler.java index 4e032335d3..b879b30c21 100644 --- a/src/main/java/net/server/handlers/login/CharSelectedHandler.java +++ b/src/main/java/net/server/handlers/login/CharSelectedHandler.java @@ -25,8 +25,8 @@ import client.MapleClient; import net.AbstractMaplePacketHandler; import net.server.Server; import net.server.coordinator.session.Hwid; -import net.server.coordinator.session.MapleSessionCoordinator; -import net.server.coordinator.session.MapleSessionCoordinator.AntiMulticlientResult; +import net.server.coordinator.session.SessionCoordinator; +import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult; import net.server.world.World; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -68,20 +68,20 @@ public final class CharSelectedHandler extends AbstractMaplePacketHandler { c.updateMacs(macs); c.updateHwid(hwid); - AntiMulticlientResult res = MapleSessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid); + AntiMulticlientResult res = SessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid); if (res != AntiMulticlientResult.SUCCESS) { c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res))); return; } if (c.hasBannedMac() || c.hasBannedHWID()) { - MapleSessionCoordinator.getInstance().closeSession(c, true); + SessionCoordinator.getInstance().closeSession(c, true); return; } Server server = Server.getInstance(); if(!server.haveCharacterEntry(c.getAccID(), charId)) { - MapleSessionCoordinator.getInstance().closeSession(c, true); + SessionCoordinator.getInstance().closeSession(c, true); return; } diff --git a/src/main/java/net/server/handlers/login/CharSelectedWithPicHandler.java b/src/main/java/net/server/handlers/login/CharSelectedWithPicHandler.java index 6a2191db25..7311b931df 100644 --- a/src/main/java/net/server/handlers/login/CharSelectedWithPicHandler.java +++ b/src/main/java/net/server/handlers/login/CharSelectedWithPicHandler.java @@ -4,8 +4,8 @@ import client.MapleClient; import net.AbstractMaplePacketHandler; import net.server.Server; import net.server.coordinator.session.Hwid; -import net.server.coordinator.session.MapleSessionCoordinator; -import net.server.coordinator.session.MapleSessionCoordinator.AntiMulticlientResult; +import net.server.coordinator.session.SessionCoordinator; +import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult; import net.server.world.World; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,13 +49,13 @@ public class CharSelectedWithPicHandler extends AbstractMaplePacketHandler { c.updateHwid(hwid); if (c.hasBannedMac() || c.hasBannedHWID()) { - MapleSessionCoordinator.getInstance().closeSession(c, true); + SessionCoordinator.getInstance().closeSession(c, true); return; } Server server = Server.getInstance(); if(!server.haveCharacterEntry(c.getAccID(), charId)) { - MapleSessionCoordinator.getInstance().closeSession(c, true); + SessionCoordinator.getInstance().closeSession(c, true); return; } @@ -73,7 +73,7 @@ public class CharSelectedWithPicHandler extends AbstractMaplePacketHandler { return; } - AntiMulticlientResult res = MapleSessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid); + AntiMulticlientResult res = SessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid); if (res != AntiMulticlientResult.SUCCESS) { c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res))); return; diff --git a/src/main/java/net/server/handlers/login/RegisterPicHandler.java b/src/main/java/net/server/handlers/login/RegisterPicHandler.java index f1e7f7315f..8d3f4a7ad8 100644 --- a/src/main/java/net/server/handlers/login/RegisterPicHandler.java +++ b/src/main/java/net/server/handlers/login/RegisterPicHandler.java @@ -4,8 +4,8 @@ import client.MapleClient; import net.AbstractMaplePacketHandler; import net.server.Server; import net.server.coordinator.session.Hwid; -import net.server.coordinator.session.MapleSessionCoordinator; -import net.server.coordinator.session.MapleSessionCoordinator.AntiMulticlientResult; +import net.server.coordinator.session.SessionCoordinator; +import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult; import net.server.world.World; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,20 +48,20 @@ public final class RegisterPicHandler extends AbstractMaplePacketHandler { c.updateMacs(macs); c.updateHwid(hwid); - AntiMulticlientResult res = MapleSessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid); + AntiMulticlientResult res = SessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid); if (res != AntiMulticlientResult.SUCCESS) { c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res))); return; } if (c.hasBannedMac() || c.hasBannedHWID()) { - MapleSessionCoordinator.getInstance().closeSession(c, true); + SessionCoordinator.getInstance().closeSession(c, true); return; } Server server = Server.getInstance(); if(!server.haveCharacterEntry(c.getAccID(), charId)) { - MapleSessionCoordinator.getInstance().closeSession(c, true); + SessionCoordinator.getInstance().closeSession(c, true); return; } @@ -91,7 +91,7 @@ public final class RegisterPicHandler extends AbstractMaplePacketHandler { e.printStackTrace(); } } else { - MapleSessionCoordinator.getInstance().closeSession(c, true); + SessionCoordinator.getInstance().closeSession(c, true); } } } \ No newline at end of file diff --git a/src/main/java/net/server/handlers/login/RegisterPinHandler.java b/src/main/java/net/server/handlers/login/RegisterPinHandler.java index 82b8d9cb9d..d35d6717e7 100644 --- a/src/main/java/net/server/handlers/login/RegisterPinHandler.java +++ b/src/main/java/net/server/handlers/login/RegisterPinHandler.java @@ -23,7 +23,7 @@ package net.server.handlers.login; import client.MapleClient; import net.AbstractMaplePacketHandler; -import net.server.coordinator.session.MapleSessionCoordinator; +import net.server.coordinator.session.SessionCoordinator; import tools.MaplePacketCreator; import tools.data.input.SeekableLittleEndianAccessor; @@ -35,7 +35,7 @@ public final class RegisterPinHandler extends AbstractMaplePacketHandler { public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { byte c2 = slea.readByte(); if (c2 == 0) { - MapleSessionCoordinator.getInstance().closeSession(c, null); + SessionCoordinator.getInstance().closeSession(c, null); c.updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN); } else { String pin = slea.readMapleAsciiString(); @@ -43,7 +43,7 @@ public final class RegisterPinHandler extends AbstractMaplePacketHandler { c.setPin(pin); c.announce(MaplePacketCreator.pinRegistered()); - MapleSessionCoordinator.getInstance().closeSession(c, null); + SessionCoordinator.getInstance().closeSession(c, null); c.updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN); } } diff --git a/src/main/java/net/server/handlers/login/SetGenderHandler.java b/src/main/java/net/server/handlers/login/SetGenderHandler.java index c208b78946..50c9292643 100644 --- a/src/main/java/net/server/handlers/login/SetGenderHandler.java +++ b/src/main/java/net/server/handlers/login/SetGenderHandler.java @@ -25,7 +25,7 @@ package net.server.handlers.login; import client.MapleClient; import net.AbstractMaplePacketHandler; import net.server.Server; -import net.server.coordinator.session.MapleSessionCoordinator; +import net.server.coordinator.session.SessionCoordinator; import tools.MaplePacketCreator; import tools.data.input.SeekableLittleEndianAccessor; @@ -44,7 +44,7 @@ public class SetGenderHandler extends AbstractMaplePacketHandler { Server.getInstance().registerLoginState(c); } else { - MapleSessionCoordinator.getInstance().closeSession(c, null); + SessionCoordinator.getInstance().closeSession(c, null); c.updateLoginState(MapleClient.LOGIN_NOTLOGGEDIN); } } diff --git a/src/main/java/net/server/handlers/login/ViewAllCharRegisterPicHandler.java b/src/main/java/net/server/handlers/login/ViewAllCharRegisterPicHandler.java index 47e4cbbdef..a2fc4842b5 100644 --- a/src/main/java/net/server/handlers/login/ViewAllCharRegisterPicHandler.java +++ b/src/main/java/net/server/handlers/login/ViewAllCharRegisterPicHandler.java @@ -4,8 +4,8 @@ import client.MapleClient; import net.AbstractMaplePacketHandler; import net.server.Server; import net.server.coordinator.session.Hwid; -import net.server.coordinator.session.MapleSessionCoordinator; -import net.server.coordinator.session.MapleSessionCoordinator.AntiMulticlientResult; +import net.server.coordinator.session.SessionCoordinator; +import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult; import net.server.world.World; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,11 +51,11 @@ public final class ViewAllCharRegisterPicHandler extends AbstractMaplePacketHand c.updateHwid(hwid); if (c.hasBannedMac() || c.hasBannedHWID()) { - MapleSessionCoordinator.getInstance().closeSession(c, true); + SessionCoordinator.getInstance().closeSession(c, true); return; } - AntiMulticlientResult res = MapleSessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid); + AntiMulticlientResult res = SessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid); if (res != AntiMulticlientResult.SUCCESS) { c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res))); return; @@ -63,7 +63,7 @@ public final class ViewAllCharRegisterPicHandler extends AbstractMaplePacketHand Server server = Server.getInstance(); if(!server.haveCharacterEntry(c.getAccID(), charId)) { - MapleSessionCoordinator.getInstance().closeSession(c, true); + SessionCoordinator.getInstance().closeSession(c, true); return; } diff --git a/src/main/java/net/server/handlers/login/ViewAllCharSelectedHandler.java b/src/main/java/net/server/handlers/login/ViewAllCharSelectedHandler.java index 32e8cb86b4..82157f8c89 100644 --- a/src/main/java/net/server/handlers/login/ViewAllCharSelectedHandler.java +++ b/src/main/java/net/server/handlers/login/ViewAllCharSelectedHandler.java @@ -25,8 +25,8 @@ import client.MapleClient; import net.AbstractMaplePacketHandler; import net.server.Server; import net.server.coordinator.session.Hwid; -import net.server.coordinator.session.MapleSessionCoordinator; -import net.server.coordinator.session.MapleSessionCoordinator.AntiMulticlientResult; +import net.server.coordinator.session.SessionCoordinator; +import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult; import net.server.world.World; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -71,11 +71,11 @@ public final class ViewAllCharSelectedHandler extends AbstractMaplePacketHandler c.updateHwid(hwid); if (c.hasBannedMac() || c.hasBannedHWID()) { - MapleSessionCoordinator.getInstance().closeSession(c, true); + SessionCoordinator.getInstance().closeSession(c, true); return; } - AntiMulticlientResult res = MapleSessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid); + AntiMulticlientResult res = SessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid); if (res != AntiMulticlientResult.SUCCESS) { c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res))); return; @@ -83,7 +83,7 @@ public final class ViewAllCharSelectedHandler extends AbstractMaplePacketHandler Server server = Server.getInstance(); if(!server.haveCharacterEntry(c.getAccID(), charId)) { - MapleSessionCoordinator.getInstance().closeSession(c, true); + SessionCoordinator.getInstance().closeSession(c, true); return; } diff --git a/src/main/java/net/server/handlers/login/ViewAllCharSelectedWithPicHandler.java b/src/main/java/net/server/handlers/login/ViewAllCharSelectedWithPicHandler.java index b5fbc40b5d..2b3a33e14c 100644 --- a/src/main/java/net/server/handlers/login/ViewAllCharSelectedWithPicHandler.java +++ b/src/main/java/net/server/handlers/login/ViewAllCharSelectedWithPicHandler.java @@ -4,8 +4,8 @@ import client.MapleClient; import net.AbstractMaplePacketHandler; import net.server.Server; import net.server.coordinator.session.Hwid; -import net.server.coordinator.session.MapleSessionCoordinator; -import net.server.coordinator.session.MapleSessionCoordinator.AntiMulticlientResult; +import net.server.coordinator.session.SessionCoordinator; +import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult; import net.server.world.World; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,13 +52,13 @@ public class ViewAllCharSelectedWithPicHandler extends AbstractMaplePacketHandle c.updateHwid(hwid); if (c.hasBannedMac() || c.hasBannedHWID()) { - MapleSessionCoordinator.getInstance().closeSession(c, true); + SessionCoordinator.getInstance().closeSession(c, true); return; } Server server = Server.getInstance(); if(!server.haveCharacterEntry(c.getAccID(), charId)) { - MapleSessionCoordinator.getInstance().closeSession(c, true); + SessionCoordinator.getInstance().closeSession(c, true); return; } @@ -79,7 +79,7 @@ public class ViewAllCharSelectedWithPicHandler extends AbstractMaplePacketHandle return; } - AntiMulticlientResult res = MapleSessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid); + AntiMulticlientResult res = SessionCoordinator.getInstance().attemptGameSession(c, c.getAccID(), hwid); if (res != AntiMulticlientResult.SUCCESS) { c.announce(MaplePacketCreator.getAfterLoginError(parseAntiMulticlientError(res))); return; diff --git a/src/main/java/net/server/task/LoginCoordinatorTask.java b/src/main/java/net/server/task/LoginCoordinatorTask.java index 6efe23b2dd..7f37434d62 100644 --- a/src/main/java/net/server/task/LoginCoordinatorTask.java +++ b/src/main/java/net/server/task/LoginCoordinatorTask.java @@ -19,7 +19,7 @@ */ package net.server.task; -import net.server.coordinator.session.MapleSessionCoordinator; +import net.server.coordinator.session.SessionCoordinator; /** * @@ -29,6 +29,6 @@ public class LoginCoordinatorTask implements Runnable { @Override public void run() { - MapleSessionCoordinator.getInstance().clearExpiredHwidHistory(); + SessionCoordinator.getInstance().clearExpiredHwidHistory(); } } diff --git a/src/main/java/net/server/task/LoginStorageTask.java b/src/main/java/net/server/task/LoginStorageTask.java index a7b99eaa84..fdf60eeb82 100644 --- a/src/main/java/net/server/task/LoginStorageTask.java +++ b/src/main/java/net/server/task/LoginStorageTask.java @@ -19,7 +19,7 @@ */ package net.server.task; -import net.server.coordinator.session.MapleSessionCoordinator; +import net.server.coordinator.session.SessionCoordinator; import net.server.coordinator.login.MapleLoginBypassCoordinator; /** @@ -30,7 +30,7 @@ public class LoginStorageTask implements Runnable { @Override public void run() { - MapleSessionCoordinator.getInstance().runUpdateLoginHistory(); + SessionCoordinator.getInstance().runUpdateLoginHistory(); MapleLoginBypassCoordinator.getInstance().runUpdateLoginBypass(); } }