Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Grasscutter
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
ziqian zhang
Grasscutter
Commits
eaed1aa0
Commit
eaed1aa0
authored
3 years ago
by
xtaodada
Browse files
Options
Downloads
Patches
Plain Diff
Change NickName to ServerNickname
parent
62f0be49
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/emu/grasscutter/Config.java
+1
-1
1 addition, 1 deletion
src/main/java/emu/grasscutter/Config.java
src/main/java/emu/grasscutter/GameConstants.java
+1
-1
1 addition, 1 deletion
src/main/java/emu/grasscutter/GameConstants.java
with
2 additions
and
2 deletions
src/main/java/emu/grasscutter/Config.java
+
1
−
1
View file @
eaed1aa0
...
...
@@ -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"
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/emu/grasscutter/GameConstants.java
+
1
−
1
View file @
eaed1aa0
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment