From f10fb46d23e6a77e4c8cb4fec98143868e5723fe Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Sun, 9 May 2021 16:59:20 +0300
Subject: [PATCH] =?UTF-8?q?=D1=83=D0=BC=D0=B5=D0=BD=D1=8C=D1=88=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D1=81=D0=BA=D0=BE=D1=80=D0=BE=D1=81=D1=82=D1=8C?=
 =?UTF-8?q?=20=D0=BE=D1=82=D0=B4=D0=B0=D1=87=D0=B8=20KeepAlive?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/mc/protocol/PacketInboundHandler.java | 18 ++++++++++++++++++
 .../src/main/java/mc/server/PacketHandler.java | 10 +++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/protocol/src/main/java/mc/protocol/PacketInboundHandler.java b/protocol/src/main/java/mc/protocol/PacketInboundHandler.java
index 81a3e0d..d567021 100644
--- a/protocol/src/main/java/mc/protocol/PacketInboundHandler.java
+++ b/protocol/src/main/java/mc/protocol/PacketInboundHandler.java
@@ -3,14 +3,20 @@ package mc.protocol;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import mc.protocol.packets.ClientSidePacket;
 import mc.protocol.event.EventBus;
 import mc.protocol.pool.PacketPool;
 import org.apache.commons.pool2.ObjectPool;
 
+import java.io.IOException;
+
+@Slf4j
 @RequiredArgsConstructor
 public class PacketInboundHandler extends SimpleChannelInboundHandler<ClientSidePacket> {
 
+	private static final String CLIENT_FORCE_DISCONNECTED_IOEXCEPTION_MESSAGE_RU = "Программа на вашем хост-компьютере разорвала установленное подключение";
+
 	private final ObjectPool<NettyConnectionContext> poolNettyConnectionContext;
 	private final PacketPool poolPackets;
 	private final EventBus eventBus;
@@ -25,4 +31,16 @@ public class PacketInboundHandler extends SimpleChannelInboundHandler<ClientSide
 		poolNettyConnectionContext.returnObject(context);
 		poolPackets.returnObject(packet);
 	}
+
+	@Override
+	public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
+		if (cause instanceof IOException && cause.getLocalizedMessage().equalsIgnoreCase(CLIENT_FORCE_DISCONNECTED_IOEXCEPTION_MESSAGE_RU)) {
+			log.warn("Client '{}' force disconnected", ctx.channel().remoteAddress());
+			if (log.isTraceEnabled()) {
+				log.trace("", cause);
+			}
+		} else {
+			log.error("{}", cause.getMessage(), cause);
+		}
+	}
 }
diff --git a/server/src/main/java/mc/server/PacketHandler.java b/server/src/main/java/mc/server/PacketHandler.java
index fad97df..ca4e9f3 100644
--- a/server/src/main/java/mc/server/PacketHandler.java
+++ b/server/src/main/java/mc/server/PacketHandler.java
@@ -26,6 +26,7 @@ import java.util.Base64;
 import java.util.Collections;
 import java.util.Random;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 
 @Slf4j
 @RequiredArgsConstructor
@@ -44,7 +45,14 @@ public class PacketHandler {
 	}
 
 	public void onKeepAlivePlay(ConnectionContext context, PingPacket packet) {
-		context.sendNow(packet);
+		try {
+			TimeUnit.MILLISECONDS.sleep(50);
+			context.sendNow(packet);
+		} catch (InterruptedException e) {
+			if (log.isTraceEnabled()) {
+				log.trace("{}", e.getMessage(), e);
+			}
+		}
 	}
 
 	@SuppressWarnings("unused")