Fix GeyserMC#4870

letsgoawaydev · Jul 17, 2024 · 406eae2 · 406eae2
1 parent 669a76c
commit 406eae2
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/...java/org/geysermc/geyser/translator/level/block/entity/CampfireBlockEntityTranslator.java b/...java/org/geysermc/geyser/translator/level/block/entity/CampfireBlockEntityTranslator.java
@@ -42,10 +42,9 @@ public class CampfireBlockEntityTranslator extends BlockEntityTranslator {
     public void translateTag(GeyserSession session, NbtMapBuilder bedrockNbt, NbtMap javaNbt, BlockState blockState) {
         List<NbtMap> items = javaNbt.getList("Items", NbtType.COMPOUND);
         if (items != null) {
-            int i = 1;
             for (NbtMap itemTag : items) {
-                bedrockNbt.put("Item" + i, getItem(session, itemTag));
-                i++;
+                int slot = itemTag.getByte("Slot") + 1;
+                bedrockNbt.put("Item" + slot, getItem(session, itemTag));
             }
         }
     }
@@ -55,8 +54,7 @@ protected NbtMap getItem(GeyserSession session, NbtMap tag) {
         if (mapping == null) {
             mapping = ItemMapping.AIR;
         }
-        NbtMapBuilder tagBuilder = BedrockItemBuilder.createItemNbt(mapping, tag.getByte("Count"), mapping.getBedrockData());
-        tagBuilder.put("tag", NbtMap.builder().build()); // I don't think this is necessary... - Camo, 1.20.5/1.20.80
+        NbtMapBuilder tagBuilder = BedrockItemBuilder.createItemNbt(mapping, tag.getInt("count"), mapping.getBedrockData());
         return tagBuilder.build();
     }
 }