From eaed1aa03862cb8965557d709a4a5e883ac27229 Mon Sep 17 00:00:00 2001 From: xtaodada Date: Fri, 29 Apr 2022 19:37:51 +0800 Subject: [PATCH] Change NickName to ServerNickname --- src/main/java/emu/grasscutter/Config.java | 2 +- src/main/java/emu/grasscutter/GameConstants.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/emu/grasscutter/Config.java b/src/main/java/emu/grasscutter/Config.java index c2d7850fd..109c7b8ee 100644 --- a/src/main/java/emu/grasscutter/Config.java +++ b/src/main/java/emu/grasscutter/Config.java @@ -51,7 +51,6 @@ public final class Config { public static class GameServerOptions { public String Name = "Test"; - public String NickName = "Server"; public String Ip = "0.0.0.0"; public String PublicIp = "127.0.0.1"; public int Port = 22102; @@ -71,6 +70,7 @@ public final class Config { public int MaxAvatarsInTeamMultiplayer = 4; public int MaxEntityLimit = 1000; // Max entity limit per world. // TODO: Enforce later. public boolean WatchGacha = false; + public String ServerNickname = "Server"; public int ServerAvatarId = 10000007; public int[] WelcomeEmotes = {2007, 1002, 4010}; public String WelcomeMotd = "Welcome to Grasscutter emu"; diff --git a/src/main/java/emu/grasscutter/GameConstants.java b/src/main/java/emu/grasscutter/GameConstants.java index 317221ec6..39b28b736 100644 --- a/src/main/java/emu/grasscutter/GameConstants.java +++ b/src/main/java/emu/grasscutter/GameConstants.java @@ -11,8 +11,8 @@ public final class GameConstants { public static final int MAX_TEAMS = 4; public static final int MAIN_CHARACTER_MALE = 10000005; 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 String SERVER_AVATAR_NAME = Grasscutter.getConfig().getGameServerOptions().NickName; public static final Position START_POSITION = new Position(2747, 194, -1719); public static final int MAX_FRIENDS = 45;