From b39ed5de53fd9b820023a3ac9c603a9936fa3e63 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Thu, 2 May 2024 20:33:28 -0400
Subject: [PATCH] Panda eating particles are not necessarily bamboo

---
 .../geysermc/geyser/entity/type/living/animal/PandaEntity.java | 3 ++-
 .../org/geysermc/geyser/inventory/item/StoredItemMappings.java | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/PandaEntity.java b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/PandaEntity.java
index 595e79e32..79401f63f 100644
--- a/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/PandaEntity.java
+++ b/core/src/main/java/org/geysermc/geyser/entity/type/living/animal/PandaEntity.java
@@ -61,7 +61,8 @@ public class PandaEntity extends AnimalEntity {
             EntityEventPacket packet = new EntityEventPacket();
             packet.setRuntimeEntityId(geyserId);
             packet.setType(EntityEventType.EATING_ITEM);
-            packet.setData(session.getItemMappings().getStoredItems().bamboo().getBedrockDefinition().getRuntimeId() << 16);
+            // As of 1.20.5 - pandas can eat cake
+            packet.setData(this.hand.getDefinition().getRuntimeId() << 16);
             session.sendUpstreamPacket(packet);
         }
     }
diff --git a/core/src/main/java/org/geysermc/geyser/inventory/item/StoredItemMappings.java b/core/src/main/java/org/geysermc/geyser/inventory/item/StoredItemMappings.java
index c15a5d3b4..0305df685 100644
--- a/core/src/main/java/org/geysermc/geyser/inventory/item/StoredItemMappings.java
+++ b/core/src/main/java/org/geysermc/geyser/inventory/item/StoredItemMappings.java
@@ -40,7 +40,6 @@ import java.util.Map;
 @Getter
 @Accessors(fluent = true)
 public class StoredItemMappings {
-    private final ItemMapping bamboo;
     private final ItemMapping banner;
     private final ItemMapping barrier;
     private final ItemMapping compass;
@@ -56,7 +55,6 @@ public class StoredItemMappings {
     private final ItemMapping writtenBook;
 
     public StoredItemMappings(Map<Item, ItemMapping> itemMappings) {
-        this.bamboo = load(itemMappings, Items.BAMBOO);
         this.banner = load(itemMappings, Items.WHITE_BANNER); // As of 1.17.10, all banners have the same Bedrock ID
         this.barrier = load(itemMappings, Items.BARRIER);
         this.compass = load(itemMappings, Items.COMPASS);