From b53c0aeb9b9eb6a51e600f4ab4fc7194068e3dcb Mon Sep 17 00:00:00 2001
From: EnZaXD <florian.michael07@gmail.com>
Date: Thu, 30 May 2024 10:45:02 +0200
Subject: [PATCH] Handle block state particles when identifier is used in
 1.20.5->.3 (#764)

---
 .../rewriter/EntityPacketRewriter1_20_5.java             | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java
index 789bb8a4..464e925d 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java
@@ -283,8 +283,13 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
 
     private void updateParticleFormat(final CompoundTag options, final String particleType) {
         if ("block".equals(particleType) || "block_marker".equals(particleType) || "falling_dust".equals(particleType) || "dust_pillar".equals(particleType)) {
-            // TODO Can be a string
-            moveTag(options, "block_state", "value");
+            Tag blockState = options.remove("block_state");
+            if (blockState instanceof StringTag) {
+                final CompoundTag compoundTag = new CompoundTag();
+                compoundTag.put("Name", blockState);
+                blockState = compoundTag;
+            }
+            options.put("value", blockState);
         } else if ("item".equals(particleType)) {
             Tag item = options.remove("item");
             if (item instanceof StringTag) {