From 205845d6af63e5f3fadd35463347bae88d78358c Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 3 Sep 2018 17:04:29 -0400 Subject: [PATCH] Changed the way port configuration is done --- .../net/simon987/server/web/ServerInfoRoute.java | 12 +----------- Server/src/main/resources/config.properties | 3 +-- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/Server/src/main/java/net/simon987/server/web/ServerInfoRoute.java b/Server/src/main/java/net/simon987/server/web/ServerInfoRoute.java index fc04d69..89522d2 100644 --- a/Server/src/main/java/net/simon987/server/web/ServerInfoRoute.java +++ b/Server/src/main/java/net/simon987/server/web/ServerInfoRoute.java @@ -15,17 +15,7 @@ public class ServerInfoRoute implements Route { public ServerInfoRoute() { //Info variables that don't change - - 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"; - } - + address = GameServer.INSTANCE.getConfig().getString("mar_address"); serverName = GameServer.INSTANCE.getConfig().getString("server_name"); tickLength = GameServer.INSTANCE.getConfig().getInt("tick_length"); } diff --git a/Server/src/main/resources/config.properties b/Server/src/main/resources/config.properties index 125a633..aa5374f 100644 --- a/Server/src/main/resources/config.properties +++ b/Server/src/main/resources/config.properties @@ -7,8 +7,7 @@ use_ssl=0 keyStore_path=certificates/keystore.jks keyStore_password= #Server -mar_port=4567 -mar_address=localhost +mar_address=ws://localhost:4567/socket server_name=MAR dev #Database