TuxCoding/FastLogin
1
0
Fork 1
mirror of https://github.com/TuxCoding/FastLogin.git synced 2025-07-30 18:57:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove complex nameChange convert since we now allow duplicate uuids

Browse Source
This commit is contained in:
games647
2016-08-26 13:32:16 +02:00
parent ad60397851
commit c28d889c1b
2 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/main/java/com/github/games647/fastlogin/core/AuthStorage.java
View File

@ -116,13 +116,7 @@ public class AuthStorage {
if (resultSet.next()) { if (resultSet.next()) {
long userId = resultSet.getInt(1); long userId = resultSet.getInt(1);
String unparsedUUID = resultSet.getString(2); UUID uuid = FastLoginCore.parseId(resultSet.getString(2));
UUID uuid;
if (unparsedUUID == null) {
uuid = null;
} else {
uuid = FastLoginCore.parseId(unparsedUUID);
}
boolean premium = resultSet.getBoolean(4); boolean premium = resultSet.getBoolean(4);
String lastIp = resultSet.getString(5); String lastIp = resultSet.getString(5);
@ -187,24 +181,6 @@ public class AuthStorage {
UUID uuid = playerProfile.getUuid(); UUID uuid = playerProfile.getUuid();
if (playerProfile.getUserId() == -1) { if (playerProfile.getUserId() == -1) {
if (uuid != null) {
//User was authenticated with a premium authentication, so it's possible that the player is premium
updateStmt = con.prepareStatement("UPDATE " + PREMIUM_TABLE
+ " SET NAME=?, LastIp=?, LastLogin=CURRENT_TIMESTAMP"
+ " WHERE UUID=?");
updateStmt.setString(1, playerProfile.getPlayerName());
updateStmt.setString(2, playerProfile.getLastIp());
updateStmt.setString(3, uuid.toString().replace("-", ""));
int affectedRows = updateStmt.executeUpdate();
if (affectedRows > 0) {
//username changed and we updated the existing database record
//so we don't need to run an insert
return true;
}
}
saveStmt = con.prepareStatement("INSERT INTO " + PREMIUM_TABLE saveStmt = con.prepareStatement("INSERT INTO " + PREMIUM_TABLE
+ " (UUID, Name, Premium, LastIp) VALUES (?, ?, ?, ?) ", Statement.RETURN_GENERATED_KEYS); + " (UUID, Name, Premium, LastIp) VALUES (?, ?, ?, ?) ", Statement.RETURN_GENERATED_KEYS);

4
core/src/main/java/com/github/games647/fastlogin/core/FastLoginCore.java
View File

@ -18,6 +18,10 @@ import java.util.logging.Logger;
public abstract class FastLoginCore { public abstract class FastLoginCore {
public static UUID parseId(String withoutDashes) { public static UUID parseId(String withoutDashes) {
if (withoutDashes == null) {
return null;
}
return UUID.fromString(withoutDashes.substring(0, 8) return UUID.fromString(withoutDashes.substring(0, 8)
+ "-" + withoutDashes.substring(8, 12) + "-" + withoutDashes.substring(8, 12)
+ "-" + withoutDashes.substring(12, 16) + "-" + withoutDashes.substring(12, 16)