From 13b55459998ae9d15a416366ed38af45f5d016d7 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <jahnke.nassim@gmail.com>
Date: Thu, 2 Dec 2021 11:11:34 +0100
Subject: [PATCH] Fix vibration and transition particle meta

---
 .../protocol1_16_4to1_17/packets/BlockItemPackets1_17.java    | 1 +
 .../protocol1_16_4to1_17/packets/EntityPackets1_17.java       | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java
index 5c28f6df..e158e036 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java
@@ -144,6 +144,7 @@ public final class BlockItemPackets1_17 extends ItemRewriter<Protocol1_16_4To1_1
                         wrapper.read(Type.FLOAT); // B
                     } else if (id == 37) {
                         // Vibration signal - no nice mapping possible without tracking entity positions and doing particle tasks
+                        wrapper.set(Type.INT, 0, -1);
                         wrapper.cancel();
                     }
                 });
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java
index 8e1adff6..c442900a 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java
@@ -160,10 +160,10 @@ public final class EntityPackets1_17 extends EntityRewriter<Protocol1_16_4To1_17
             MetaType type = meta.metaType();
             if (type == Types1_16.META_TYPES.particleType) {
                 Particle particle = (Particle) meta.getValue();
-                if (particle.getId() == 15) { // Dust / Dust Transition
+                if (particle.getId() == 16) { // Dust / Dust Transition
                     // Remove transition target color values 4-6
                     particle.getArguments().subList(4, 7).clear();
-                } else if (particle.getId() == 36) { // Vibration Signal
+                } else if (particle.getId() == 37) { // Vibration Signal
                     // No nice mapping possible without tracking entity positions and doing particle tasks
                     particle.setId(0);
                     particle.getArguments().clear();