From d8b27bcfd55b29c1320a031f377790f14cc4e123 Mon Sep 17 00:00:00 2001 From: KittenPixel-cell Date: Sun, 5 May 2024 16:06:59 -0700 Subject: [PATCH 1/4] This version will allow the private server owner to show a different email then "@grasscutter.io" if they want. --- src/main/java/emu/grasscutter/config/ConfigContainer.java | 1 + src/main/java/emu/grasscutter/game/Account.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/emu/grasscutter/config/ConfigContainer.java b/src/main/java/emu/grasscutter/config/ConfigContainer.java index fd264e26bb8..4886ed6c978 100644 --- a/src/main/java/emu/grasscutter/config/ConfigContainer.java +++ b/src/main/java/emu/grasscutter/config/ConfigContainer.java @@ -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; } diff --git a/src/main/java/emu/grasscutter/game/Account.java b/src/main/java/emu/grasscutter/game/Account.java index da1193b9856..3ac4c4bd3dc 100644 --- a/src/main/java/emu/grasscutter/game/Account.java +++ b/src/main/java/emu/grasscutter/game/Account.java @@ -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; } } @@ -235,7 +235,7 @@ public void onLoad(Document document) { this.addPermission("*"); } - // Set account default language as server default language + // Set account default language as fserver default language if (!document.containsKey("locale")) { this.locale = LANGUAGE; } From cfc7e97338ba4c2e4741969e20f770554a84bce4 Mon Sep 17 00:00:00 2001 From: KittenPixel <79544605+KittenPixel-cell@users.noreply.github.com> Date: Mon, 6 May 2024 15:16:38 -0700 Subject: [PATCH 2/4] Update src/main/java/emu/grasscutter/config/ConfigContainer.java Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com> --- src/main/java/emu/grasscutter/config/ConfigContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/emu/grasscutter/config/ConfigContainer.java b/src/main/java/emu/grasscutter/config/ConfigContainer.java index 4886ed6c978..2b6d20978c5 100644 --- a/src/main/java/emu/grasscutter/config/ConfigContainer.java +++ b/src/main/java/emu/grasscutter/config/ConfigContainer.java @@ -140,7 +140,7 @@ public static class Account { public boolean autoCreate = false; public boolean EXPERIMENTAL_RealPassword = false; public String[] defaultPermissions = {}; - public String playeremail = "grasscutter.io"; + public String playerEmail = "grasscutter.io"; public int maxPlayer = -1; } From dca8781f5c71d3b4092f43a98ee9e6b1995f7132 Mon Sep 17 00:00:00 2001 From: KittenPixel <79544605+KittenPixel-cell@users.noreply.github.com> Date: Mon, 6 May 2024 15:17:06 -0700 Subject: [PATCH 3/4] Update src/main/java/emu/grasscutter/game/Account.java Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com> --- src/main/java/emu/grasscutter/game/Account.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/emu/grasscutter/game/Account.java b/src/main/java/emu/grasscutter/game/Account.java index 3ac4c4bd3dc..1e61ab090c2 100644 --- a/src/main/java/emu/grasscutter/game/Account.java +++ b/src/main/java/emu/grasscutter/game/Account.java @@ -235,7 +235,7 @@ public void onLoad(Document document) { this.addPermission("*"); } - // Set account default language as fserver default language + // Set account default language to server default language if (!document.containsKey("locale")) { this.locale = LANGUAGE; } From 3ce8307292e1f49b17480613583ae2f82bb29f31 Mon Sep 17 00:00:00 2001 From: KittenPixel <79544605+KittenPixel-cell@users.noreply.github.com> Date: Mon, 6 May 2024 15:17:51 -0700 Subject: [PATCH 4/4] Update src/main/java/emu/grasscutter/game/Account.java Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com> --- src/main/java/emu/grasscutter/game/Account.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/emu/grasscutter/game/Account.java b/src/main/java/emu/grasscutter/game/Account.java index 1e61ab090c2..c796b998183 100644 --- a/src/main/java/emu/grasscutter/game/Account.java +++ b/src/main/java/emu/grasscutter/game/Account.java @@ -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() + "@"+ACCOUNT.playeremail; + return this.getUsername() + "@" + ACCOUNT.playerEmail; } }