From 9b5ff8a6ad54289af210ded8c8ecf3c374340b2f Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sun, 13 Aug 2017 19:19:42 +0300 Subject: [PATCH] =?UTF-8?q?Zond:=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0?= =?UTF-8?q?=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/asys/zond/proxy/client/ClientPacketHandler.java | 4 ++-- zond/src/main/java/asys/zond/proxy/client/Connector.java | 4 ++-- zond/src/main/resources/zond.properties | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/zond/src/main/java/asys/zond/proxy/client/ClientPacketHandler.java b/zond/src/main/java/asys/zond/proxy/client/ClientPacketHandler.java index 84c70a8..202d416 100644 --- a/zond/src/main/java/asys/zond/proxy/client/ClientPacketHandler.java +++ b/zond/src/main/java/asys/zond/proxy/client/ClientPacketHandler.java @@ -45,8 +45,8 @@ public class ClientPacketHandler extends ChannelInboundHandlerAdapter implements ctx.channel().attr(KNOWN_HANDLERS).set(handshakeHandlers); ctx.channel().writeAndFlush(new CS_Handshake( - Config.getInstance().getString("serverId"), - Config.getInstance().getString("passcode") + Config.getInstance().getString("asys.serverId"), + Config.getInstance().getString("asys.passcode") )); } diff --git a/zond/src/main/java/asys/zond/proxy/client/Connector.java b/zond/src/main/java/asys/zond/proxy/client/Connector.java index 9ffb5cd..191bee3 100644 --- a/zond/src/main/java/asys/zond/proxy/client/Connector.java +++ b/zond/src/main/java/asys/zond/proxy/client/Connector.java @@ -31,8 +31,8 @@ public class Connector { connectTicker.setTask(() -> { Shell.getInstance().getOutput() .println(String.format("Connect(%d) to ASys...", ++tryConnect)); - client.connect(Config.getInstance().getString("host"), - Config.getInstance().getInt("port")); + client.connect(Config.getInstance().getString("asys.host"), + Config.getInstance().getInt("asys.port")); if (client.isConnected()) { stopReconnect(); } else { diff --git a/zond/src/main/resources/zond.properties b/zond/src/main/resources/zond.properties index 6c3d764..ddffcb0 100644 --- a/zond/src/main/resources/zond.properties +++ b/zond/src/main/resources/zond.properties @@ -1,7 +1,7 @@ -serverId = SpigotServer0 -host = 127.0.0.1 -port = 8779 -passcode = testpassphrase +asys.serverId = SpigotServer0 +asys.host = 127.0.0.1 +asys.port = 8779 +asys.passcode = testpassphrase bridge.port = 8710 bridge.second = 5 pingmonitor.delay = 5