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

Rename loginattempt

Browse Source
This commit is contained in:
P0nk
2024-09-29 14:24:56 +02:00
parent 902f1a154e
commit fa666c98e6
2 changed files with 6 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,7 +108,7 @@ public class Client extends ChannelInboundHandlerAdapter {
private Set<String> macs = new HashSet<>(); private Set<String> macs = new HashSet<>();
private Map<String, ScriptEngine> engines = new HashMap<>(); private Map<String, ScriptEngine> engines = new HashMap<>();
private byte characterSlots = 3; private byte characterSlots = 3;
private byte loginattempt = 0; private byte failedLoginAttempts = 0;
private String pin = ""; private String pin = "";
private int pinattempt = 0; private int pinattempt = 0;
private String pic = ""; private String pic = "";
@@ -295,6 +295,8 @@ public class Client extends ChannelInboundHandlerAdapter {
LocalDate birthdate = account.birthdate(); LocalDate birthdate = account.birthdate();
calendar.set(birthdate.getYear(), birthdate.getMonthValue() - 1, birthdate.getDayOfMonth()); calendar.set(birthdate.getYear(), birthdate.getMonthValue() - 1, birthdate.getDayOfMonth());
this.birthday = calendar; this.birthday = calendar;
loggedIn = account.loginState() == LoginState.LOGGED_IN;
inServerTransition = account.loginState() == LoginState.SERVER_TRANSITION;
} }
public Character getPlayer() { public Character getPlayer() {
@@ -499,9 +501,8 @@ public class Client extends ChannelInboundHandlerAdapter {
return false; return false;
} }
public boolean tryLogin() { public boolean attemptLogin() {
if (++loginattempt >= MAX_FAILED_LOGIN_ATTEMPTS) { if (++failedLoginAttempts >= MAX_FAILED_LOGIN_ATTEMPTS) {
loggedIn = false;
SessionCoordinator.getInstance().closeSession(this, false); SessionCoordinator.getInstance().closeSession(this, false);
return false; return false;
} }
@@ -658,53 +659,6 @@ public class Client extends ChannelInboundHandlerAdapter {
return account.lastLogin().isBefore(LocalDateTime.now().minusSeconds(30)); return account.lastLogin().isBefore(LocalDateTime.now().minusSeconds(30));
} }
// TODO: move to LoginPasswordHandler
public int getLoginState() { // 0 = LOGIN_NOTLOGGEDIN, 1= LOGIN_SERVER_TRANSITION, 2 = LOGIN_LOGGEDIN
try (Connection con = DatabaseConnection.getConnection()) {
int state;
try (PreparedStatement ps = con.prepareStatement("SELECT loggedin, lastlogin, birthday FROM accounts WHERE id = ?")) {
ps.setInt(1, getAccID());
try (ResultSet rs = ps.executeQuery()) {
if (!rs.next()) {
throw new RuntimeException("getLoginState - Client AccID: " + getAccID());
}
birthday = Calendar.getInstance();
try {
birthday.setTime(rs.getDate("birthday"));
} catch (SQLException e) {
}
state = rs.getInt("loggedin");
if (state == LoginState.SERVER_TRANSITION) {
if (rs.getTimestamp("lastlogin").getTime() + 30000 < Server.getInstance().getCurrentTime()) {
int accountId = accId;
state = LoginState.LOGGED_OUT;
updateLoginState(LoginState.LOGGED_OUT); // ACCID = 0, issue found thanks to Tochi & K u ssss o & Thora & Omo Oppa
this.setAccID(accountId);
}
}
}
}
if (state == LoginState.LOGGED_IN) {
loggedIn = true;
} else if (state == LoginState.SERVER_TRANSITION) {
try (PreparedStatement ps2 = con.prepareStatement("UPDATE accounts SET loggedin = 0 WHERE id = ?")) {
ps2.setInt(1, getAccID());
ps2.executeUpdate();
}
} else {
loggedIn = false;
}
return state;
} catch (SQLException e) {
loggedIn = false;
e.printStackTrace();
throw new RuntimeException("login state");
}
}
public boolean checkBirthDate(Calendar date) { public boolean checkBirthDate(Calendar date) {
return date.get(Calendar.YEAR) == birthday.get(Calendar.YEAR) && date.get(Calendar.MONTH) == birthday.get(Calendar.MONTH) && date.get(Calendar.DAY_OF_MONTH) == birthday.get(Calendar.DAY_OF_MONTH); return date.get(Calendar.YEAR) == birthday.get(Calendar.YEAR) && date.get(Calendar.MONTH) == birthday.get(Calendar.MONTH) && date.get(Calendar.DAY_OF_MONTH) == birthday.get(Calendar.DAY_OF_MONTH);
} }

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

@@ -82,7 +82,7 @@ public final class LoginPasswordHandler implements PacketHandler {
byte[] hwidNibbles = p.readBytes(4); byte[] hwidNibbles = p.readBytes(4);
c.setHwid(new Hwid(HexTool.toCompactHexString(hwidNibbles))); c.setHwid(new Hwid(HexTool.toCompactHexString(hwidNibbles)));
if (!c.tryLogin()) { if (!c.attemptLogin()) {
return; return;
} }
Optional<Account> foundAccount = accountService.getAccount(login); Optional<Account> foundAccount = accountService.getAccount(login);