Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-26 16:40:55 +00:00
Code Issues Projects Releases Wiki Activity

Make sure no player already has the reserved UID when creating and account.

Browse Source
This commit is contained in:
ImmuState 2022-06-01 14:55:33 -07:00 committed by Melledy
parent 7f3e8984ac
commit e1688c866f
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/emu/grasscutter/database/DatabaseHelper.java
View File

@ -38,10 +38,18 @@ public final class DatabaseHelper {
if (reservedId == GameConstants.SERVER_CONSOLE_UID) { if (reservedId == GameConstants.SERVER_CONSOLE_UID) {
return null; return null;
} }
// Make sure not other accounts has that id as its reservedPlayerId
exists = DatabaseHelper.getAccountByPlayerId(reservedId); exists = DatabaseHelper.getAccountByPlayerId(reservedId);
if (exists != null) { if (exists != null) {
return null; return null;
} }
// Make sure no existing player already has this id.
Player existsPlayer = DatabaseHelper.getPlayerByUid(reservedId);
if (existsPlayer != null) {
return null;
}
} }
// Account // Account

2
src/main/resources/languages/en-US.json
View File

@ -103,7 +103,7 @@
"account": { "account": {
"modify": "Modify user accounts", "modify": "Modify user accounts",
"invalid": "Invalid UID.", "invalid": "Invalid UID.",
"exists": "Account already exists.", "exists": "An account with this username and/or UID already exists.",
"create": "Account created with UID %s.", "create": "Account created with UID %s.",
"delete": "Account deleted.", "delete": "Account deleted.",
"no_account": "Account not found.", "no_account": "Account not found.",