From 3520f99d5afb02f65a0fc49d432ec7a8595a7278 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Fri, 19 Apr 2024 09:56:24 +0200
Subject: [PATCH] Remove empty items from various block entities

---
 .../rewriter/BlockItemPacketRewriter1_20_5.java   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
index 76a7a6228..a7263c24a 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
@@ -1343,6 +1343,21 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
                 data.set(StructuredDataKey.BANNER_PATTERNS, layers);
             }
         }
+
+        // Remove air item from brushable blocks, decorated pots, jukeboxes, and lecterns
+        removeEmptyItem(tag, "item");
+        removeEmptyItem(tag, "RecordItem");
+        removeEmptyItem(tag, "Book");
+    }
+
+    private void removeEmptyItem(final CompoundTag tag, final String key) {
+        final CompoundTag itemTag = tag.getCompoundTag(key);
+        if (itemTag != null) {
+            final int id = itemTag.getInt("id");
+            if (id == 0) {
+                tag.remove(key);
+            }
+        }
     }
 
     private void updateSkullOwnerTag(final CompoundTag tag, final CompoundTag skullOwnerTag) {