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

Refactor Client#finishLogin

Browse Source
This commit is contained in:
P0nk
2023-08-06 17:26:34 +02:00
parent 810dbcc1d7
commit f44083aeba
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -509,19 +509,19 @@ public class Client extends ChannelInboundHandlerAdapter {
} }
} }
public int finishLogin() { public boolean finishLogin() {
encoderLock.lock(); encoderLock.lock();
try { try {
if (getLoginState() > LOGIN_NOTLOGGEDIN) { // 0 = LOGIN_NOTLOGGEDIN, 1= LOGIN_SERVER_TRANSITION, 2 = LOGIN_LOGGEDIN if (getLoginState() > LOGIN_NOTLOGGEDIN) { // 0 = LOGIN_NOTLOGGEDIN, 1= LOGIN_SERVER_TRANSITION, 2 = LOGIN_LOGGEDIN
loggedIn = false; loggedIn = false;
return 7; return false;
} }
updateLoginState(Client.LOGIN_LOGGEDIN); updateLoginState(Client.LOGIN_LOGGEDIN);
} finally { } finally {
encoderLock.unlock(); encoderLock.unlock();
} }
return 0; return true;
} }
public void setPin(String pin) { public void setPin(String pin) {
@@ -917,18 +917,18 @@ public class Client extends ChannelInboundHandlerAdapter {
} }
public final void disconnect(final boolean shutdown, final boolean cashshop) { public final void disconnect(final boolean shutdown, final boolean cashshop) {
if (canDisconnect()) { if (tryDisconnect()) {
ThreadManager.getInstance().newTask(() -> disconnectInternal(shutdown, cashshop)); ThreadManager.getInstance().newTask(() -> disconnectInternal(shutdown, cashshop));
} }
} }
public final void forceDisconnect() { public final void forceDisconnect() {
if (canDisconnect()) { if (tryDisconnect()) {
disconnectInternal(true, false); disconnectInternal(true, false);
} }
} }
private synchronized boolean canDisconnect() { private synchronized boolean tryDisconnect() {
if (disconnecting) { if (disconnecting) {
return false; return false;
} }

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

@@ -22,7 +22,7 @@ public final class AcceptToSHandler extends AbstractPacketHandler {
throw new GameViolationException("ToS not accepted"); throw new GameViolationException("ToS not accepted");
} }
if (c.finishLogin() == 0) { if (c.finishLogin()) {
c.sendPacket(PacketCreator.getAuthSuccess(c)); c.sendPacket(PacketCreator.getAuthSuccess(c));
} else { } else {
c.sendPacket(PacketCreator.getLoginFailed(9));//shouldn't happen XD c.sendPacket(PacketCreator.getLoginFailed(9));//shouldn't happen XD

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

@@ -123,7 +123,7 @@ public final class LoginPasswordHandler implements PacketHandler {
c.sendPacket(PacketCreator.getLoginFailed(loginok)); c.sendPacket(PacketCreator.getLoginFailed(loginok));
return; return;
} }
if (c.finishLogin() == 0) { if (c.finishLogin()) {
c.checkChar(c.getAccID()); c.checkChar(c.getAccID());
login(c); login(c);
} else { } else {