From 9b6fccd9bd741f34eac3c69e19d2aeb953c01254 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Thu, 29 Apr 2021 21:43:07 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B8=D1=87=D0=B8=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=BE=D1=82=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=BE=D1=82=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=B0=20?= =?UTF-8?q?=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/src/main/java/mc/server/Main.java | 3 +-- server/src/main/java/mc/server/config/Config.java | 1 + server/src/main/java/mc/server/di/ConfigModule.java | 1 + server/src/main/resources/config.yml | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/mc/server/Main.java b/server/src/main/java/mc/server/Main.java index b18143b..c839916 100644 --- a/server/src/main/java/mc/server/Main.java +++ b/server/src/main/java/mc/server/Main.java @@ -7,7 +7,6 @@ import lombok.extern.slf4j.Slf4j; import mc.protocol.NettyServer; import mc.protocol.ProtocolConstant; import mc.protocol.model.ServerInfo; -import mc.protocol.model.text.Text; import mc.protocol.packets.PingPacket; import mc.protocol.packets.client.HandshakePacket; import mc.protocol.packets.client.LoginStartPacket; @@ -78,7 +77,7 @@ public class Main { .doOnNext(channel -> log.info("{}", channel.getPacket())) .subscribe(channel -> { DisconnectPacket disconnectPacket = new DisconnectPacket(); - disconnectPacket.setReason(Text.of("Server is not available.")); + disconnectPacket.setReason(TextSerializer.fromPlain(config.disconnectReason())); channel.getCtx().writeAndFlush(disconnectPacket).channel().disconnect(); }); diff --git a/server/src/main/java/mc/server/config/Config.java b/server/src/main/java/mc/server/config/Config.java index 310adf6..07340fc 100644 --- a/server/src/main/java/mc/server/config/Config.java +++ b/server/src/main/java/mc/server/config/Config.java @@ -17,6 +17,7 @@ public class Config { private final Players players = new Players(); private String motd; + private String disconnectReason; private Path iconPath; @Getter diff --git a/server/src/main/java/mc/server/di/ConfigModule.java b/server/src/main/java/mc/server/di/ConfigModule.java index 510b077..c4bd5b0 100644 --- a/server/src/main/java/mc/server/di/ConfigModule.java +++ b/server/src/main/java/mc/server/di/ConfigModule.java @@ -28,6 +28,7 @@ public class ConfigModule { config.server().host(fromYamlPath("server/host", map, "127.0.0.1")); config.server().port(fromYamlPath("server/port", map, 25565)); config.motd(fromYamlPath("motd", map, "")); + config.disconnectReason(fromYamlPath("disconnect-reason", map, "")); config.players().maxOnlile(fromYamlPath("players/max-online", map, 0)); config.players().onlile(fromYamlPath("players/online", map, 0)); diff --git a/server/src/main/resources/config.yml b/server/src/main/resources/config.yml index 8ae56bf..7bbd46a 100644 --- a/server/src/main/resources/config.yml +++ b/server/src/main/resources/config.yml @@ -6,6 +6,8 @@ motd: | &bmc-project &8:: &4ZERO &8develop by &7DmitriyMX +disconnect-reason: '&4Server is not available.' + players: max-online: 0 online: 0