From 3ae1e8d880d2960f8061378551c1c7f525e090db Mon Sep 17 00:00:00 2001
From: oryxel1 <gamingnoob681@gmail.com>
Date: Mon, 15 Dec 2025 20:38:36 +0700
Subject: [PATCH] Fix: properly map item data back to item mapping.

---
 .../java/org/geysermc/geyser/registry/type/ItemMappings.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/geysermc/geyser/registry/type/ItemMappings.java b/core/src/main/java/org/geysermc/geyser/registry/type/ItemMappings.java
index b0ffe13b2de..fc33f00e42a 100644
--- a/core/src/main/java/org/geysermc/geyser/registry/type/ItemMappings.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/type/ItemMappings.java
@@ -159,7 +159,7 @@ public ItemMapping getMapping(ItemData data) {
         for (ItemMapping mapping : this.items) {
             if (mapping.getBedrockDefinition().getRuntimeId() == definition.getRuntimeId()) {
                 if (isBlock && !hasDamage) { // Pre-1.16.220 will not use block runtime IDs at all, so we shouldn't check either
-                    if (data.getBlockDefinition() != mapping.getBedrockBlockDefinition()) {
+                    if (data.getBlockDefinition() != mapping.getBedrockBlockDefinition() && !(data.getBlockDefinition() != null && data.getBlockDefinition().getRuntimeId() == 0 && mapping.getBedrockBlockDefinition() == null)) {
                         continue;
                     }
                 } else {