simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-04-24 13:05:51 +00:00
Code Issues Projects Releases Wiki Activity

Changed the way port configuration is done

Browse Source
This commit is contained in:
Simon 2018-09-03 17:04:29 -04:00
parent 64193ecf7a
commit 205845d6af
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Server/src/main/java/net/simon987/server/web/ServerInfoRoute.java
View File

@ -15,17 +15,7 @@ public class ServerInfoRoute implements Route {
public ServerInfoRoute() { public ServerInfoRoute() {
//Info variables that don't change //Info variables that don't change
address = GameServer.INSTANCE.getConfig().getString("mar_address");
if (GameServer.INSTANCE.getConfig().getInt("use_ssl") == 0) {
address = "ws://" +
GameServer.INSTANCE.getConfig().getString("mar_address") + ":" +
GameServer.INSTANCE.getConfig().getString("mar_port") + "/socket";
} else {
address = "wss://" +
GameServer.INSTANCE.getConfig().getString("mar_address") + ":" +
GameServer.INSTANCE.getConfig().getString("mar_port") + "/socket";
}
serverName = GameServer.INSTANCE.getConfig().getString("server_name"); serverName = GameServer.INSTANCE.getConfig().getString("server_name");
tickLength = GameServer.INSTANCE.getConfig().getInt("tick_length"); tickLength = GameServer.INSTANCE.getConfig().getInt("tick_length");
} }

3
Server/src/main/resources/config.properties
View File

@ -7,8 +7,7 @@ use_ssl=0
keyStore_path=certificates/keystore.jks keyStore_path=certificates/keystore.jks
keyStore_password= keyStore_password=
#Server #Server
mar_port=4567 mar_address=ws://localhost:4567/socket
mar_address=localhost
server_name=MAR dev server_name=MAR dev
#Database #Database