b

core/src/main/java/org/geysermc/geyser/network/CodecProcessor.java

@@ -105,10 +105,6 @@ class CodecProcessor {
         }
     };
 
-
-    /**
-     * The player can cause a packet error themselves, which hackers can exploit to spam legitimate errors
-     */
     private static final BedrockPacketSerializer<SetPlayerInventoryOptionsPacket> SET_PLAYER_INVENTORY_OPTIONS_SERIALIZER = new SetPlayerInventoryOptionsSerializer_v360() {
         @Override
         public void deserialize(ByteBuf buffer, BedrockCodecHelper helper, SetPlayerInventoryOptionsPacket packet) {
@@ -128,13 +124,6 @@ class CodecProcessor {
         }
     };
 
-    private static final BedrockPacketSerializer<ItemStackRequestPacket> ITEM_STACK_REQUEST_SERIALIZER = new ItemStackRequestSerializer_v407() {
-        @Override
-        public void deserialize(ByteBuf buffer, BedrockCodecHelper helper, ItemStackRequestPacket packet) {
-            helper.readArray(buffer, packet.getRequests(), helper::readItemStackRequest, 110); // 64 is NOT enough, cloudburst
-        }
-    };
-
     private static final BedrockPacketSerializer<CommandRequestPacket> COMMAND_REQUEST_SERIALIZER = new CommandRequestSerializer_v567() {
         @Override
         public void deserialize(ByteBuf buffer, BedrockCodecHelper helper, CommandRequestPacket packet) {
@@ -313,9 +302,7 @@ class CodecProcessor {
             // Ignored bidirectional packets
             .updateSerializer(ClientCacheStatusPacket.class, IGNORED_SERIALIZER)
             .updateSerializer(SimpleEventPacket.class, IGNORED_SERIALIZER)
-            .updateSerializer(MultiplayerSettingsPacket.class, IGNORED_SERIALIZER)
+            .updateSerializer(MultiplayerSettingsPacket.class, IGNORED_SERIALIZER);
-            // Small limit
-            .updateSerializer(ItemStackRequestPacket.class, ITEM_STACK_REQUEST_SERIALIZER);
 
 
             if (codec.getProtocolVersion() < 685) {

core/src/main/java/org/geysermc/geyser/network/LoggingPacketHandler.java

@@ -44,7 +44,7 @@ public class LoggingPacketHandler implements BedrockPacketHandler {
     LoggingPacketHandler(GeyserImpl geyser, GeyserSession session) {
         this.geyser = geyser;
         this.session = session;
-        this.cooldownHandler = new PacketCooldownManager(session, 1000);
+        this.cooldownHandler = new PacketCooldownManager(session);
     }
 
     public boolean handleLimit(BedrockPacket packet) {

core/src/main/java/org/geysermc/geyser/network/PacketCooldownManager.java

@@ -1,25 +1,21 @@
 package org.geysermc.geyser.network;
 
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import lombok.Getter;
 import lombok.Setter;
 import org.cloudburstmc.protocol.bedrock.packet.*;
 import org.geysermc.geyser.session.GeyserSession;
 
-import java.util.HashMap;
 import java.util.Map;
 
 public class PacketCooldownManager {
-    private final Map<String, CooldownSettings> packetCooldownSettings = new HashMap<>();
 
     private final GeyserSession session;
-    @Setter
+    private final Map<String, CooldownSettings> packetCooldownSettings = new Object2ObjectOpenHashMap<>();
-    private long cooldownMillisDebug;
+    private final Map<String, CooldownTracker> activeCooldowns = new Object2ObjectOpenHashMap<>();
-    private long expiryTimeMillisDebug;
 
-    public PacketCooldownManager(GeyserSession session, long cooldownMillisDebug) {
+    public PacketCooldownManager(GeyserSession session) {
         this.session = session;
-        this.setCooldownMillisDebug(cooldownMillisDebug);
-        this.expiryTimeMillisDebug = 0;
 
         setPacketCooldown(LoginPacket.class, -1, 2);
         setPacketCooldown(ResourcePackClientResponsePacket.class, -1, 4);
@@ -33,24 +29,11 @@ public class PacketCooldownManager {
         packetCooldownSettings.put(packetClass.getSimpleName(), new CooldownSettings(cooldownMillis, maxCount));
     }
 
-    private final Map<String, CooldownTracker> activeCooldowns = new HashMap<>();
+    private boolean isCooldown(BedrockPacket packet) {
-
-    private boolean isCooldownActive(BedrockPacket packet) {
-        String packetName = packet.getClass().getSimpleName();
-        CooldownTracker tracker = activeCooldowns.get(packetName);
-        if (tracker != null && tracker.getCount() >= packetCooldownSettings.get(packetName).maxCount()) {
-            if (tracker.getExpiryTime() != -1 && tracker.getExpiryTime() <= System.currentTimeMillis()) {
-                activeCooldowns.remove(packetName);
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private void updateCooldown(BedrockPacket packet) {
         String packetName = packet.getClass().getSimpleName();
         CooldownSettings settings = packetCooldownSettings.get(packetName);
+        if (settings == null) return false;
+
         CooldownTracker tracker = activeCooldowns.computeIfAbsent(packetName, k -> {
             CooldownTracker newTracker = new CooldownTracker();
             long cooldownMillis = settings.cooldownMillis();
@@ -62,26 +45,27 @@ public class PacketCooldownManager {
             return newTracker;
         });
         tracker.incrementCount();
+
+        if (tracker.getExpiryTime() != -1 && tracker.getExpiryTime() <= System.currentTimeMillis()) {
+            activeCooldowns.remove(packetName);
+            return false;
+        }
+
+        return tracker.getCount() >= settings.maxCount();
     }
 
-    public boolean handle(BedrockPacket packet) {
+    public void handle(BedrockPacket packet) {
         String packetName = packet.getClass().getSimpleName();
-        if (packetCooldownSettings.containsKey(packetName)) {
+        if (!isCooldown(packet)) return;
-            updateCooldown(packet);
+        if (session.getGeyser().getConfig().isDebugMode()) {
-            if (isCooldownActive(packet)) {
+            CooldownTracker tracker = activeCooldowns.get(packetName);
-                if (expiryTimeMillisDebug <= System.currentTimeMillis()) {
+            String message = session.getSocketAddress().getAddress().toString() + " -> Attempted to send too many packets " + packetName + " count " + tracker.getCount();
-                    CooldownTracker tracker = activeCooldowns.get(packetName);
+            if (session.isLoggedIn()) {
-                    String message = session.getSocketAddress().getAddress().toString() + " -> Attempted to send too many packets " + packet.getClass().getSimpleName() + " count " + tracker.getCount();
+                message += " by user " + session.bedrockUsername();
-                    if (session.isLoggedIn()) {
-                        message += " by user " + session.bedrockUsername();
-                    }
-                    session.getGeyser().getLogger().debug(message);
-                }
-                this.expiryTimeMillisDebug = System.currentTimeMillis() + cooldownMillisDebug;
-                return false;
             }
+            session.getGeyser().getLogger().debug(message);
         }
-        return true;
+        session.disconnect("many Packets " + packetName);
     }
 
     private record CooldownSettings(int cooldownMillis, int maxCount) {
@@ -97,4 +81,4 @@ public class PacketCooldownManager {
             this.count++;
         }
     }
-}
+}

core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockTextTranslator.java

@@ -37,11 +37,9 @@ public class BedrockTextTranslator extends PacketTranslator<TextPacket> {
 
     @Override
     public void translate(GeyserSession session, TextPacket packet) {
-        String message = packet.getMessage();
-
         // Java trims all messages, and then checks for the leading slash
-        message = MessageTranslator.convertToPlainText(
+        String message = MessageTranslator.convertToPlainText(
-                MessageTranslator.normalizeSpace(message)
+                MessageTranslator.normalizeSpace(packet.getMessage())
         );
 
         if (message.isBlank()) {