Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-10-22 20:30:53 +02:00
Code Issues Projects Releases Wiki Activity

Move orphan-handling code down to bottom

Browse Source
This commit is contained in:
riking 2013-06-28 13:49:30 -07:00
parent 43f8f7b76e
commit f63c5e3310
1 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java
View File

@ -353,27 +353,7 @@ public final class SQLDatabaseManager implements DatabaseManager {
} }
catch (SQLException e) {} catch (SQLException e) {}
} }
// Problem, no rows returned
result.close(); result.close();
// First, read User Id - this is to check for orphans
int id = readId(playerName);
if (id == -1) {
// There is no such user
if (create) {
newUser(playerName);
return new PlayerProfile(playerName, true);
}
else {
return new PlayerProfile(playerName, false);
}
}
// There is such a user
writeMissingRows(id);
// Retry, and abort on re-failure
return loadPlayerProfile(playerName, false);
} }
catch (SQLException ex) { catch (SQLException ex) {
printErrors(ex); printErrors(ex);
@ -389,13 +369,26 @@ public final class SQLDatabaseManager implements DatabaseManager {
} }
} }
if (!create) { // Problem, nothing was returned
return new PlayerProfile(playerName, false);
// First, read User Id - this is to check for orphans
int id = readId(playerName);
if (id == -1) {
// There is no such user
if (create) {
newUser(playerName);
return new PlayerProfile(playerName, true);
}
else {
return new PlayerProfile(playerName, false);
}
} }
// There is such a user
newUser(playerName); writeMissingRows(id);
// Retry, and abort on re-failure
return new PlayerProfile(playerName, true); return loadPlayerProfile(playerName, false);
} }
public void convertUsers(DatabaseManager destination) { public void convertUsers(DatabaseManager destination) {