Skip to content

Commit

Permalink
Merge pull request #7 from Grasscutters/development
Browse files Browse the repository at this point in the history
Configuration Update - Shown Email (Grasscutters#2509)
  • Loading branch information
WatchAndyTW authored May 16, 2024
2 parents 7e3785a + 4022267 commit 1268432
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/main/java/emu/grasscutter/config/ConfigContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ public static class Account {
public boolean autoCreate = false;
public boolean EXPERIMENTAL_RealPassword = false;
public String[] defaultPermissions = {};
public String playerEmail = "grasscutter.io";
public int maxPlayer = -1;
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/emu/grasscutter/game/Account.java
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public String getEmail() {
return email;
} else {
// As of game version 3.5+, only the email is displayed to a user.
return this.getUsername() + "@grasscutter.io";
return this.getUsername() + "@" + ACCOUNT.playerEmail;
}
}

Expand Down Expand Up @@ -235,7 +235,7 @@ public void onLoad(Document document) {
this.addPermission("*");
}

// Set account default language as server default language
// Set account default language to server default language
if (!document.containsKey("locale")) {
this.locale = LANGUAGE;
}
Expand Down

0 comments on commit 1268432

Please sign in to comment.