From c682c5a7b0607be57271311674865d9b52660af8 Mon Sep 17 00:00:00 2001
From: OurLobanov <klobanov960@gmail.com>
Date: Wed, 26 Jun 2024 20:40:14 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../geyser/network/LoggingPacketHandler.java  | 12 +----------
 .../geyser/network/UpstreamPacketHandler.java | 20 +++++--------------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/network/LoggingPacketHandler.java b/core/src/main/java/org/geysermc/geyser/network/LoggingPacketHandler.java
index 7f35e4c33..d1ae569e7 100644
--- a/core/src/main/java/org/geysermc/geyser/network/LoggingPacketHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/LoggingPacketHandler.java
@@ -47,18 +47,8 @@ public class LoggingPacketHandler implements BedrockPacketHandler {
         this.cooldownHandler = new PacketCooldownManager(session);
     }
 
-    public boolean handleLimit(BedrockPacket packet) {
-        boolean safePacket = this.cooldownHandler.handle(packet);
-        if (!safePacket) {
-            session.disconnect("many Packets " + packet.getClass().getSimpleName());
-        }
-        return !safePacket;
-    }
-
     PacketSignal defaultHandler(BedrockPacket packet) {
-        if (handleLimit(packet)) {
-            return PacketSignal.HANDLED;
-        }
+        this.cooldownHandler.handle(packet);
         geyser.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName());
         return PacketSignal.HANDLED;
     }
diff --git a/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java b/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
index 9f71f58b3..3a721d116 100644
--- a/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
@@ -85,9 +85,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
 
     @Override
     PacketSignal defaultHandler(BedrockPacket packet) {
-        if (handleLimit(packet)) {
-            return PacketSignal.HANDLED;
-        }
+        this.cooldownHandler.handle(packet);
         return translateAndDefault(packet);
     }
 
@@ -156,9 +154,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
 
     @Override
     public PacketSignal handle(LoginPacket loginPacket) {
-        if(this.handleLimit(loginPacket)){
-            return PacketSignal.HANDLED;
-        }
+        this.cooldownHandler.handle(loginPacket);
         if (geyser.isShuttingDown() || geyser.isReloading()) {
             // Don't allow new players in if we're no longer operating
             session.disconnect(GeyserLocale.getLocaleStringLog("geyser.core.shutdown.kick.message"));
@@ -210,9 +206,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
 
     @Override
     public PacketSignal handle(ResourcePackClientResponsePacket packet) {
-        if (this.handleLimit(packet)) {
-            return PacketSignal.HANDLED;
-        }
+        this.cooldownHandler.handle(packet);
         if (packet.getPackIds().size() > this.resourcePackLoadEvent.getPacks().size()) {
             session.disconnect("Packet " + packet.getClass().getSimpleName() + " PackIds max count");
             return PacketSignal.HANDLED;
@@ -281,9 +275,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
 
     @Override
     public PacketSignal handle(ModalFormResponsePacket packet) {
-        if(this.handleLimit(packet)){
-            return PacketSignal.HANDLED;
-        }
+        this.cooldownHandler.handle(packet);
         session.executeInEventLoop(() -> session.getFormCache().handleResponse(packet));
         return PacketSignal.HANDLED;
     }
@@ -324,9 +316,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
 
     @Override
     public PacketSignal handle(ResourcePackChunkRequestPacket packet) {
-        if (this.handleLimit(packet)) {
-            return PacketSignal.HANDLED;
-        }
+        this.cooldownHandler.handle(packet);
         ResourcePackChunkDataPacket data = new ResourcePackChunkDataPacket();
         ResourcePack pack = this.resourcePackLoadEvent.getPacks().get(packet.getPackId().toString());
         if (pack == null) {