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

Rename NOT_LOGGED_IN -> LOGGED_OUT

Browse Source
This commit is contained in:
P0nk
2024-09-29 09:15:01 +02:00
parent a580e44bc9
commit 4e1aa1eb1a
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/client/Client.java
View File

@@ -600,7 +600,7 @@ public class Client extends ChannelInboundHandlerAdapter {
e.printStackTrace(); e.printStackTrace();
} }
if (newState == LoginState.NOT_LOGGED_IN) { if (newState == LoginState.LOGGED_OUT) {
loggedIn = false; loggedIn = false;
inServerTransition = false; inServerTransition = false;
setAccID(0); setAccID(0);
@@ -614,7 +614,7 @@ public class Client extends ChannelInboundHandlerAdapter {
} }
public void setLoginState(int newState) { public void setLoginState(int newState) {
if (newState == LoginState.NOT_LOGGED_IN) { if (newState == LoginState.LOGGED_OUT) {
loggedIn = false; loggedIn = false;
inServerTransition = false; inServerTransition = false;
setAccID(0); setAccID(0);
@@ -632,8 +632,8 @@ public class Client extends ChannelInboundHandlerAdapter {
public byte getLoginState(Account account) { public byte getLoginState(Account account) {
byte loginState = account.loginState(); byte loginState = account.loginState();
if (loginState == LoginState.SERVER_TRANSITION && lastLoginOverThirtySecondsAgo(account)) { if (loginState == LoginState.SERVER_TRANSITION && lastLoginOverThirtySecondsAgo(account)) {
loginState = LoginState.NOT_LOGGED_IN; loginState = LoginState.LOGGED_OUT;
updateLoginState(LoginState.NOT_LOGGED_IN); updateLoginState(LoginState.LOGGED_OUT);
} }
if (loginState == LoginState.LOGGED_IN) { if (loginState == LoginState.LOGGED_IN) {
@@ -680,8 +680,8 @@ public class Client extends ChannelInboundHandlerAdapter {
if (state == LoginState.SERVER_TRANSITION) { if (state == LoginState.SERVER_TRANSITION) {
if (rs.getTimestamp("lastlogin").getTime() + 30000 < Server.getInstance().getCurrentTime()) { if (rs.getTimestamp("lastlogin").getTime() + 30000 < Server.getInstance().getCurrentTime()) {
int accountId = accId; int accountId = accId;
state = LoginState.NOT_LOGGED_IN; state = LoginState.LOGGED_OUT;
updateLoginState(LoginState.NOT_LOGGED_IN); // ACCID = 0, issue found thanks to Tochi & K u ssss o & Thora & Omo Oppa updateLoginState(LoginState.LOGGED_OUT); // ACCID = 0, issue found thanks to Tochi & K u ssss o & Thora & Omo Oppa
this.setAccID(accountId); this.setAccID(accountId);
} }
} }

2
src/main/java/client/LoginState.java
View File

@@ -4,7 +4,7 @@ package client;
* @author Ponk * @author Ponk
*/ */
public class LoginState { public class LoginState {
public static final byte NOT_LOGGED_IN = 0; // TODO: rename to LOGGED_OUT public static final byte LOGGED_OUT = 0;
public static final byte SERVER_TRANSITION = 1; public static final byte SERVER_TRANSITION = 1;
public static final byte LOGGED_IN = 2; public static final byte LOGGED_IN = 2;
} }

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

@@ -111,7 +111,7 @@ public final class LoginPasswordHandler implements PacketHandler {
c.setAccount(account); c.setAccount(account);
if (c.getLoginState(account) > LoginState.NOT_LOGGED_IN) { if (c.getLoginState(account) > LoginState.LOGGED_OUT) {
c.sendPacket(PacketCreator.getLoginFailed(7)); c.sendPacket(PacketCreator.getLoginFailed(7));
return; return;
} }

6
src/main/java/service/AccountService.java
View File

@@ -38,7 +38,7 @@ public class AccountService {
.password(hashPassword(password)) .password(hashPassword(password))
.birthdate(GMS_RELEASE) .birthdate(GMS_RELEASE)
.chrSlots(INITIAL_CHR_SLOTS) .chrSlots(INITIAL_CHR_SLOTS)
.loginState(LoginState.NOT_LOGGED_IN) .loginState(LoginState.LOGGED_OUT)
.gender(null) .gender(null)
.build(); .build();
@@ -216,7 +216,7 @@ public class AccountService {
public boolean setLoggedIn(Client c) { public boolean setLoggedIn(Client c) {
byte newState = LoginState.LOGGED_IN; byte newState = LoginState.LOGGED_IN;
int currentState = c.getLoginState(); int currentState = c.getLoginState();
if (currentState != LoginState.NOT_LOGGED_IN && currentState != LoginState.SERVER_TRANSITION) { if (currentState != LoginState.LOGGED_OUT && currentState != LoginState.SERVER_TRANSITION) {
return false; return false;
} }
@@ -230,7 +230,7 @@ public class AccountService {
} }
public void setLoggedOut(Client c) { public void setLoggedOut(Client c) {
setLoginState(c, LoginState.NOT_LOGGED_IN); setLoginState(c, LoginState.LOGGED_OUT);
} }
public void setInTransition(Client c) { public void setInTransition(Client c) {

4
src/main/java/service/TransitionService.java
View File

@@ -179,11 +179,11 @@ public class TransitionService {
if (!c.isInTransition() && c.isLoggedIn()) { if (!c.isInTransition() && c.isLoggedIn()) {
c.updateLoginState(LoginState.NOT_LOGGED_IN); c.updateLoginState(LoginState.LOGGED_OUT);
c.clear(); c.clear();
} else { } else {
if (!Server.getInstance().hasCharacteridInTransition(c)) { if (!Server.getInstance().hasCharacteridInTransition(c)) {
c.updateLoginState(LoginState.NOT_LOGGED_IN); c.updateLoginState(LoginState.LOGGED_OUT);
} }
c.clearEngines(); c.clearEngines();