FatBoy/lakebane
1
0
Fork 0
forked from MagicBane/Server
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Methods moved out of old login handler

Browse Source
This commit is contained in:
MagicBot
2024-03-31 10:37:03 -04:00
parent f62f11a66c
commit 4e5e49606c
9 changed files with 88 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/handlers/DeleteCharacterMsgHandler.java
+6 -7
View File
@@ -17,7 +17,6 @@ import engine.objects.GuildStatusController;
import engine.objects.PlayerCharacter;
import engine.server.MBServerStatics;
import engine.server.login.LoginServer;
import engine.server.login.LoginServerMsgHandler;
import engine.session.Session;
import org.pmw.tinylog.Logger;
@@ -47,19 +46,19 @@ public class DeleteCharacterMsgHandler extends AbstractClientMsgHandler {
if (playerCharacter == null) {
Logger.error("Delete Error: PlayerID=" + msg.getCharacterUUID() + " not found.");
LoginServerMsgHandler.sendCharacterSelectScreen(session);
LoginServer.sendCharacterSelectScreen(session);
return true;
}
if (session.getAccount() == null) {
Logger.error("Delete Error: Account not found.");
LoginServerMsgHandler.sendCharacterSelectScreen(session);
LoginServer.sendCharacterSelectScreen(session);
return true;
}
if (playerCharacter.getAccount().equals(session.getAccount()) == false) {
Logger.error("Delete Error: Character " + playerCharacter.getName() + " does not belong to account " + origin.getAccount().getUname());
LoginServerMsgHandler.sendCharacterSelectScreen(session);
LoginServer.sendCharacterSelectScreen(session);
return true;
}
@@ -67,7 +66,7 @@ public class DeleteCharacterMsgHandler extends AbstractClientMsgHandler {
//TODO either find an error or just gdisband.
if (GuildStatusController.isGuildLeader(playerCharacter.getGuildStatus())) {
LoginServerMsgHandler.KickToLogin(MBServerStatics.LOGINERROR_UNABLE_TO_LOGIN, "Cannot delete a guild leader.", origin);
LoginServer.KickToLogin(MBServerStatics.LOGINERROR_UNABLE_TO_LOGIN, "Cannot delete a guild leader.", origin);
return true;
}
@@ -75,7 +74,7 @@ public class DeleteCharacterMsgHandler extends AbstractClientMsgHandler {
if (LoginServer.getActiveBaneQuery(playerCharacter)) {
Logger.info("Character " + playerCharacter.getName() + " has unresolved bane");
LoginServerMsgHandler.KickToLogin(MBServerStatics.LOGINERROR_UNABLE_TO_LOGIN, "Player has unresolved bane.", origin);
LoginServer.KickToLogin(MBServerStatics.LOGINERROR_UNABLE_TO_LOGIN, "Player has unresolved bane.", origin);
return true;
}
@@ -84,7 +83,7 @@ public class DeleteCharacterMsgHandler extends AbstractClientMsgHandler {
// TODO Delete Equipment
// Resend Character Select Screen.
LoginServerMsgHandler.sendCharacterSelectScreen(session);
LoginServer.sendCharacterSelectScreen(session);
} catch (Exception e) {
Logger.error(e);