Use item identifiers in item frame nbt sent to client (#2144)

CloudburstMC · Oct 24, 2023 · 50319c2 · 50319c2
1 parent 3328245
commit 50319c2
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/main/java/cn/nukkit/blockentity/BlockEntityItemFrame.java b/src/main/java/cn/nukkit/blockentity/BlockEntityItemFrame.java
@@ -6,6 +6,7 @@
 import cn.nukkit.event.block.ItemFrameDropItemEvent;
 import cn.nukkit.item.Item;
 import cn.nukkit.item.ItemBlock;
+import cn.nukkit.item.RuntimeItems;
 import cn.nukkit.level.format.FullChunk;
 import cn.nukkit.nbt.NBTIO;
 import cn.nukkit.nbt.tag.CompoundTag;
@@ -103,7 +104,12 @@ public CompoundTag getSpawnCompound() {
                 .putInt("y", (int) this.y)
                 .putInt("z", (int) this.z);
 
-        if (item.getShort("id") != Item.AIR) {
+        int itemId = item.getShort("id");
+        if (itemId != Item.AIR) {
+            String identifier = RuntimeItems.getMapping().toRuntime(itemId, item.getShort("Damage")).getIdentifier();
+            item.putString("Name", identifier);
+            item.remove("id");
+
             tag.putCompound("Item", item)
                     .putByte("ItemRotation", this.getItemRotation());
         }