From 39b05e284ec12d37e23faed6363b59b188838b3b Mon Sep 17 00:00:00 2001
From: chris <github@onechris.mozmail.com>
Date: Wed, 13 Mar 2024 20:25:30 +0100
Subject: [PATCH] update protocol lib to resolve command crashing (#4493)

---
 .../java/org/geysermc/geyser/session/GeyserSession.java   | 7 -------
 .../translator/protocol/java/JavaCommandsTranslator.java  | 8 --------
 gradle/libs.versions.toml                                 | 4 ++--
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
index b95b5af8d..7a4a8ff6f 100644
--- a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
+++ b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
@@ -602,13 +602,6 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
     @Setter
     private @Nullable ItemData currentBook = null;
 
-    /**
-     * Stores if we've sent AvailibleCommandsPacket to the client due to it crashing if sent twice on 1.20.70/71
-     * Hopefully bedrock will have a hotfix so we can remove this
-     */
-    @Setter
-    private boolean sentAvailibleCommands = false;
-
     private final GeyserCameraData cameraData;
 
     private final GeyserEntityData entityData;
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 7ded656dd..0d7f45c7d 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
@@ -46,7 +46,6 @@ import org.geysermc.geyser.GeyserImpl;
 import org.geysermc.geyser.api.event.java.ServerDefineCommandsEvent;
 import org.geysermc.geyser.command.GeyserCommandManager;
 import org.geysermc.geyser.inventory.item.Enchantment;
-import org.geysermc.geyser.network.GameProtocol;
 import org.geysermc.geyser.registry.BlockRegistries;
 import org.geysermc.geyser.registry.Registries;
 import org.geysermc.geyser.session.GeyserSession;
@@ -116,12 +115,6 @@ public class JavaCommandsTranslator extends PacketTranslator<ClientboundCommands
             return;
         }
 
-        // Don't send command suggestions if they are already sent and the client is 1.20.70 or higher due to crash bug
-        // TODO: Remove this check when the crash bug is fixed
-        if (session.isSentAvailibleCommands() && !GameProtocol.isPre1_20_70(session)) {
-            return;
-        }
-
         GeyserCommandManager manager = session.getGeyser().commandManager();
         CommandNode[] nodes = packet.getNodes();
         List<CommandData> commandData = new ArrayList<>();
@@ -198,7 +191,6 @@ public class JavaCommandsTranslator extends PacketTranslator<ClientboundCommands
 
         // Finally, send the commands to the client
         session.sendUpstreamPacket(availableCommandsPacket);
-        session.setSentAvailibleCommands(true);
     }
 
     /**
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 41e1ebaec..c7138e2d8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,8 +9,8 @@ netty = "4.1.103.Final"
 guava = "29.0-jre"
 gson = "2.3.1" # Provided by Spigot 1.8.8
 websocket = "1.5.1"
-protocol = "3.0.0.Beta1-20240226.201527-125"
-protocol-connection = "3.0.0.Beta1-20240226.201527-124"
+protocol = "3.0.0.Beta1-20240313.120922-126"
+protocol-connection = "3.0.0.Beta1-20240313.120922-125"
 raknet = "1.0.0.CR1-20231206.145325-12"
 blockstateupdater="1.20.70-20240303.125052-2"
 mcauthlib = "d9d773e"