Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Configuration Update - Shown Email #2509

Merged
merged 4 commits into from
May 14, 2024
Merged

Configuration Update - Shown Email #2509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8b27bc
This version will allow the private server owner to show a different …
KittenPixel-cell May 5, 2024
cfc7e97
Update src/main/java/emu/grasscutter/config/ConfigContainer.java
KittenPixel-cell May 6, 2024
dca8781
Update src/main/java/emu/grasscutter/game/Account.java
KittenPixel-cell May 6, 2024
3ce8307
Update src/main/java/emu/grasscutter/game/Account.java
KittenPixel-cell May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/emu/grasscutter/config/ConfigContainer.java
View file
Open in desktop
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
View file
Open in desktop
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