From 3570caae258e43b61bfc628d18f0408e3b08af78 Mon Sep 17 00:00:00 2001
From: Valaphee The Meerkat <32491319+valaphee@users.noreply.github.com>
Date: Mon, 27 May 2024 16:53:42 +0200
Subject: [PATCH] Fix crafting output not updating sometimes (#4692)

* Only cancel crafting grid future if slot == 0

* Add some comments
---
 .../inventory/JavaContainerSetSlotTranslator.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaContainerSetSlotTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaContainerSetSlotTranslator.java
index 4372b5ea5..57da00b51 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaContainerSetSlotTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaContainerSetSlotTranslator.java
@@ -71,10 +71,6 @@ public class JavaContainerSetSlotTranslator extends PacketTranslator<Clientbound
 
         InventoryTranslator translator = session.getInventoryTranslator();
         if (translator != null) {
-            if (session.getCraftingGridFuture() != null) {
-                session.getCraftingGridFuture().cancel(false);
-            }
-
             int slot = packet.getSlot();
             if (slot >= inventory.getSize()) {
                 GeyserLogger logger = session.getGeyser().getLogger();
@@ -111,14 +107,22 @@ public class JavaContainerSetSlotTranslator extends PacketTranslator<Clientbound
      * Checks for a changed output slot in the crafting grid, and ensures Bedrock sees the recipe.
      */
     private static void updateCraftingGrid(GeyserSession session, int slot, ItemStack item, Inventory inventory, InventoryTranslator translator) {
+        // Check if it's the crafting grid result slot.
         if (slot != 0) {
             return;
         }
+
+        // Check if there is any crafting grid.
         int gridSize = translator.getGridSize();
         if (gridSize == -1) {
             return;
         }
 
+        // Only process the most recent crafting grid result, and cancel the previous one.
+        if (session.getCraftingGridFuture() != null) {
+            session.getCraftingGridFuture().cancel(false);
+        }
+
         if (InventoryUtils.isEmpty(item)) {
             return;
         }