Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-15 08:25:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/development' into development

Browse Source
This commit is contained in:
Benjamin Elsdon
2022-04-22 01:04:03 +08:00
parent beb8675190 0e7976f906
commit 9eca5123a5
11 changed files with 188 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@ public final class Config {
public String DatabaseUrl = "mongodb://localhost:27017";
public String DatabaseCollection = "grasscutter";
public String RESOURCE_FOLDER = "./resources/";
public String DATA_FOLDER = "./data/";
public String PACKETS_FOLDER = "./packets/";
@@ -24,11 +24,9 @@ public final class Config {
public DispatchServerOptions getDispatchOptions() { return DispatchServer; }
public static class DispatchServerOptions {
public String Ip = "127.0.0.1";
public String PublicIp = "";
public String Ip = "0.0.0.0";
public String PublicIp = "127.0.0.1";
public int Port = 443;
public int OverseaLogPort = 8888;
public int UploadLogPort = 80;
public String KeystorePath = "./keystore.p12";
public String KeystorePassword = "";
public Boolean UseSSL = true;
@@ -51,8 +49,8 @@ public final class Config {
public static class GameServerOptions {
public String Name = "Test";
public String Ip = "127.0.0.1";
public String PublicIp = "";
public String Ip = "0.0.0.0";
public String PublicIp = "127.0.0.1";
public int Port = 22102;
public String DispatchServerDatabaseUrl = "mongodb://localhost:27017";