From 0e3a7cfd9d79203523302c40152bd32e036de715 Mon Sep 17 00:00:00 2001
From: oryxel <gamingnoob681@gmail.com>
Date: Mon, 30 Jun 2025 16:37:44 +0700
Subject: [PATCH] Fixed invalid recipe (non-vanilla items) (#5596)

* Fixed invalid recipe (non-vanilla item).

* Added comments.
---
 .../protocol/java/JavaRecipeBookAddTranslator.java   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaRecipeBookAddTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaRecipeBookAddTranslator.java
index 332ef32db..27a463f4f 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaRecipeBookAddTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaRecipeBookAddTranslator.java
@@ -310,6 +310,12 @@ public class JavaRecipeBookAddTranslator extends PacketTranslator<ClientboundRec
             return ItemDescriptorWithCount.EMPTY;
         }
         ItemMapping mapping = session.getItemMappings().getMapping(item);
+
+        // This is likely a modded java item or some item Geyser haven't mapped.
+        if (mapping.getJavaItem().javaId() == Items.AIR_ID) {
+            return ItemDescriptorWithCount.EMPTY;
+        }
+
         return new ItemDescriptorWithCount(new DefaultDescriptor(mapping.getBedrockDefinition(), mapping.getBedrockData()), 1); // Need to check count
     }
 
@@ -362,6 +368,12 @@ public class JavaRecipeBookAddTranslator extends PacketTranslator<ClientboundRec
             if (translated == null) {
                 continue;
             }
+
+            // As of 1.21.82, Bedrock will crash if we tried to send invalid descriptor.
+            if (translated.contains(ItemDescriptorWithCount.EMPTY)) {
+                continue;
+            }
+
             inputs.add(translated);
             if (translated.size() != 1 || translated.get(0) != ItemDescriptorWithCount.EMPTY) {
                 empty = false;