Fix BlockData merge for cached states (#14080)

Author: ZapolyarnyDev

paper-server/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java

@@ -456,6 +456,7 @@ public static void reloadCache() {
         ENCODER_CACHE.clear();
         Block.BLOCK_STATE_REGISTRY.forEach(state -> {
             CraftBlockData data = state.asBlockData();
+            data.parsedStates = state.getValues().toList();
             ENCODER_CACHE.put(data.getAsString(), data);
         });
     }

paper-server/src/test/java/org/bukkit/BlockDataTest.java

@@ -99,6 +99,22 @@ public void testMerge() {
         assertNotEquals(falseTarget, candidate, "Target and candidate are still not equal");
     }
 
+    @Test
+    public void testMergeFullySpecifiedBannerData() {
+        BlockData banner = CraftBlockData.fromString(null, "minecraft:light_gray_banner");
+        BlockData rotation = CraftBlockData.fromString(null, "minecraft:light_gray_banner[rotation=1]");
+
+        assertEquals(rotation, banner.merge(rotation));
+    }
+
+    @Test
+    public void testMergeFullySpecifiedLogData() {
+        BlockData log = CraftBlockData.fromString(BlockType.OAK_LOG, null);
+        BlockData axis = CraftBlockData.fromString(BlockType.OAK_LOG, "[axis=y]");
+
+        assertEquals(axis, log.merge(axis));
+    }
+
     @Test
     public void testMergeAny() {
         Chest trueTarget = (Chest) CraftBlockData.fromString(null, "minecraft:chest[facing=east,waterlogged=true]");