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

Reduce login state updates, fix multi-login on same acc

Browse Source
This commit is contained in:
P0nk
2024-09-29 15:55:14 +02:00
parent fa666c98e6
commit 5450c29178
4 changed files with 21 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/server/channel/handlers/PlayerLoggedinHandler.java
View File

@@ -192,7 +192,7 @@ public final class PlayerLoggedinHandler extends AbstractPacketHandler {
}
try {
int state = c.getLoginState(account);
int state = account.loginState();
if (state != LoginState.SERVER_TRANSITION) {
c.setPlayer(null);
c.setAccID(0);

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

@@ -83,8 +83,11 @@ public final class LoginPasswordHandler implements PacketHandler {
c.setHwid(new Hwid(HexTool.toCompactHexString(hwidNibbles)));
if (!c.attemptLogin()) {
c.sendPacket(PacketCreator.getLoginFailed(10));
SessionCoordinator.getInstance().closeSession(c, false);
return;
}
Optional<Account> foundAccount = accountService.getAccount(login);
if (foundAccount.isEmpty()) {
if (YamlConfig.config.server.AUTOMATIC_REGISTER) {
@@ -97,6 +100,12 @@ public final class LoginPasswordHandler implements PacketHandler {
}
Account account = foundAccount.get();
if (!correctPassword(pwd, account)) {
c.sendPacket(PacketCreator.getLoginFailed(4));
return;
}
if (account.banned()) {
c.sendPacket(PacketCreator.getLoginFailed(3));
// TODO: send ban reason instead of login failed, something like this:
@@ -104,18 +113,13 @@ public final class LoginPasswordHandler implements PacketHandler {
return;
}
if (!correctPassword(pwd, account)) {
c.sendPacket(PacketCreator.getLoginFailed(4));
if (account.loginState() > LoginState.LOGGED_OUT) {
c.sendPacket(PacketCreator.getLoginFailed(7));
return;
}
c.setAccount(account);
if (c.getLoginState(account) > LoginState.LOGGED_OUT) {
c.sendPacket(PacketCreator.getLoginFailed(7));
return;
}
if (!account.acceptedTos()) {
c.sendPacket(PacketCreator.getLoginFailed(23));
return;