Commit eaed1aa0 authored by xtaodada's avatar xtaodada
Browse files

Change NickName to ServerNickname

parent 62f0be49
...@@ -51,7 +51,6 @@ public final class Config { ...@@ -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 { ...@@ -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";
......
...@@ -11,8 +11,8 @@ public final class GameConstants { ...@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment