Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-24 02:31:27 +00:00
Code Issues Projects Releases Wiki Activity

Change NickName to ServerNickname

Browse Source
This commit is contained in:
xtaodada 2022-04-29 19:37:51 +08:00
parent c4bdfc26eb
commit 8c3333dbea
Signed by: xtaodada
GPG Key ID: 4CBB3F4FA8C85659
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/emu/grasscutter/Config.java
View File

@ -51,7 +51,6 @@ public final class Config {
public static class GameServerOptions { public static class GameServerOptions {
public String Name = "Test"; public String Name = "Test";
public String NickName = "Server";
public String Ip = "0.0.0.0"; public String Ip = "0.0.0.0";
public String PublicIp = "127.0.0.1"; public String PublicIp = "127.0.0.1";
public int Port = 22102; public int Port = 22102;
@ -71,6 +70,7 @@ public final class Config {
public int MaxAvatarsInTeamMultiplayer = 4; public int MaxAvatarsInTeamMultiplayer = 4;
public int MaxEntityLimit = 1000; // Max entity limit per world. // TODO: Enforce later. public int MaxEntityLimit = 1000; // Max entity limit per world. // TODO: Enforce later.
public boolean WatchGacha = false; public boolean WatchGacha = false;
public String ServerNickname = "Server";
public int ServerAvatarId = 10000007; public int ServerAvatarId = 10000007;
public int[] WelcomeEmotes = {2007, 1002, 4010}; public int[] WelcomeEmotes = {2007, 1002, 4010};
public String WelcomeMotd = "Welcome to Grasscutter emu"; public String WelcomeMotd = "Welcome to Grasscutter emu";

2
src/main/java/emu/grasscutter/GameConstants.java
View File

@ -11,8 +11,8 @@ public final class GameConstants {
public static final int MAX_TEAMS = 4; public static final int MAX_TEAMS = 4;
public static final int MAIN_CHARACTER_MALE = 10000005; public static final int MAIN_CHARACTER_MALE = 10000005;
public static final int MAIN_CHARACTER_FEMALE = 10000007; public static final int MAIN_CHARACTER_FEMALE = 10000007;
public static final String SERVER_AVATAR_NAME = Grasscutter.getConfig().getGameServerOptions().ServerNickname;
public static final int SERVER_AVATAR_ID = Grasscutter.getConfig().getGameServerOptions().ServerAvatarId; public static final int SERVER_AVATAR_ID = Grasscutter.getConfig().getGameServerOptions().ServerAvatarId;
public static final String SERVER_AVATAR_NAME = Grasscutter.getConfig().getGameServerOptions().NickName;
public static final Position START_POSITION = new Position(2747, 194, -1719); public static final Position START_POSITION = new Position(2747, 194, -1719);
public static final int MAX_FRIENDS = 45; public static final int MAX_FRIENDS = 45;