From 8b61d168f75c054adc05281d688f52cedd1c23c3 Mon Sep 17 00:00:00 2001
From: KennyTV <kennytv@t-online.de>
Date: Wed, 24 Jun 2020 14:05:52 +0200
Subject: [PATCH] Send remaining (empty) tags Fixes #1830

---
 .../us/myles/ViaVersion/api/rewriters/TagRewriter.java   | 7 +++++++
 .../protocol1_16to1_15_2/Protocol1_16To1_15_2.java       | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/common/src/main/java/us/myles/ViaVersion/api/rewriters/TagRewriter.java b/common/src/main/java/us/myles/ViaVersion/api/rewriters/TagRewriter.java
index f9667e65c..2f9a017c9 100644
--- a/common/src/main/java/us/myles/ViaVersion/api/rewriters/TagRewriter.java
+++ b/common/src/main/java/us/myles/ViaVersion/api/rewriters/TagRewriter.java
@@ -34,6 +34,13 @@ public class TagRewriter {
         getNewTags(tagType).add(new TagData(id, EMPTY_ARRAY));
     }
 
+    public void addEmptyTags(TagType tagType, String... ids) {
+        List<TagData> tagList = getNewTags(tagType);
+        for (String id : ids) {
+            tagList.add(new TagData(id, EMPTY_ARRAY));
+        }
+    }
+
     public void addTag(TagType tagType, String id, int... oldIds) {
         List<TagData> newTags = getNewTags(tagType);
         IdRewriteFunction rewriteFunction = getRewriter(tagType);
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
index 219c25e03..403c67f9f 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
@@ -224,6 +224,15 @@ public class Protocol1_16To1_15_2 extends Protocol<ClientboundPackets1_15, Clien
         tagRewriter.addEmptyTag(TagType.BLOCK, "minecraft:soul_fire_base_blocks");
         tagRewriter.addEmptyTag(TagType.BLOCK, "minecraft:non_flammable_wood");
         tagRewriter.addEmptyTag(TagType.ITEM, "minecraft:non_flammable_wood");
+
+        // The rest of not accessed tags added in older versions; #1830
+        tagRewriter.addEmptyTags(TagType.BLOCK, "minecraft:bamboo_plantable_on", "minecraft:beds", "minecraft:bee_growables",
+                "minecraft:beehives", "minecraft:coral_plants", "minecraft:crops", "minecraft:dragon_immune", "minecraft:flowers",
+                "minecraft:portals", "minecraft:shulker_boxes", "minecraft:small_flowers", "minecraft:tall_flowers", "minecraft:trapdoors",
+                "minecraft:underwater_bonemeals", "minecraft:wither_immune", "minecraft:wooden_fences", "minecraft:wooden_trapdoors");
+        tagRewriter.addEmptyTags(TagType.ENTITY, "minecraft:arrows", "minecraft:beehive_inhabitors", "minecraft:raiders", "minecraft:skeletons");
+        tagRewriter.addEmptyTags(TagType.ITEM, "minecraft:beds", "minecraft:coals", "minecraft:fences", "minecraft:flowers",
+                "minecraft:lectern_books", "minecraft:music_discs", "minecraft:small_flowers", "minecraft:tall_flowers", "minecraft:trapdoors", "minecraft:walls", "minecraft:wooden_fences");
     }
 
     public static int getNewBlockStateId(int id) {