Refactor Client#finishLogin

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

View File

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

View File

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

View File

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