From e4c11401db49c7660626a90b5d6c435e4e2e0af3 Mon Sep 17 00:00:00 2001
From: onebeastchris <github@onechris.mozmail.com>
Date: Wed, 10 Dec 2025 21:34:00 +0100
Subject: [PATCH] Update protocol to resolve more client crashes on 1.21.130,
 re-enable commands, bump version

---
 .../org/geysermc/geyser/network/UpstreamPacketHandler.java  | 4 ----
 .../translator/protocol/java/JavaCommandsTranslator.java    | 3 +--
 gradle.properties                                           | 2 +-
 gradle/libs.versions.toml                                   | 6 +++---
 4 files changed, 5 insertions(+), 10 deletions(-)

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 de6046e61..b7ba7b8b5 100644
--- a/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
@@ -119,10 +119,6 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
 
     private boolean setCorrectCodec(int protocolVersion) {
         BedrockCodec packetCodec = GameProtocol.getBedrockCodec(protocolVersion);
-        // temp fix allowing 1.21.130 preview to join
-        if (protocolVersion == 897) {
-            packetCodec = GameProtocol.getBedrockCodec(898);
-        }
         if (packetCodec == null) {
             // None of our Bedrock codecs support this client version, so we can simply compare it to our default protocol.
             String supportedVersions = GameProtocol.getAllSupportedBedrockVersions();
diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCommandsTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCommandsTranslator.java
index 8416e9ff0..8602d37dc 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCommandsTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCommandsTranslator.java
@@ -43,7 +43,6 @@ import org.geysermc.geyser.GeyserImpl;
 import org.geysermc.geyser.api.event.java.ServerDefineCommandsEvent;
 import org.geysermc.geyser.api.util.PlatformType;
 import org.geysermc.geyser.command.CommandRegistry;
-import org.geysermc.geyser.network.GameProtocol;
 import org.geysermc.geyser.registry.BlockRegistries;
 import org.geysermc.geyser.registry.Registries;
 import org.geysermc.geyser.session.GeyserSession;
@@ -124,7 +123,7 @@ public class JavaCommandsTranslator extends PacketTranslator<ClientboundCommands
     @Override
     public void translate(GeyserSession session, ClientboundCommandsPacket packet) {
         // Don't send command suggestions if they are disabled
-        if (GameProtocol.is1_21_130orHigher(session.protocolVersion()) || !session.getGeyser().config().gameplay().commandSuggestions()) {
+        if (!session.getGeyser().config().gameplay().commandSuggestions()) {
             session.getGeyser().getLogger().debug("Not sending translated command suggestions as they are disabled.");
 
             // Send a mostly empty packet so Bedrock doesn't override /help with its own, built-in help command.
diff --git a/gradle.properties b/gradle.properties
index 57c0249ee..c39797f55 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,5 +8,5 @@ org.gradle.vfs.watch=false
 
 group=org.geysermc
 id=geyser
-version=2.9.1-SNAPSHOT
+version=2.9.2-SNAPSHOT
 description=Allows for players from Minecraft: Bedrock Edition to join Minecraft: Java Edition servers.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b350aad8b..5048e7b0a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,9 +13,9 @@ guava = "29.0-jre"
 gson = "2.3.1" # Provided by Spigot 1.8.8 TODO bump to 2.8.1 or similar (Spigot 1.16.5 version) after Merge
 gson-runtime = "2.10.1"
 websocket = "1.5.1"
-protocol-connection = "3.0.0.Beta11-20251209.183710-13"
-protocol-common = "3.0.0.Beta11-20251209.183710-12"
-protocol-codec = "3.0.0.Beta11-20251209.183710-13"
+protocol-connection = "3.0.0.Beta11-20251210.195537-15"
+protocol-common = "3.0.0.Beta11-20251210.195537-14"
+protocol-codec = "3.0.0.Beta11-20251210.195537-15"
 raknet = "1.0.0.CR3-20251208.214317-23"
 minecraftauth = "5.0.0"
 mcprotocollib = "1.21.9-20251029.184056-18"