From b466ed9eb8a5eb6c1a4a900a28c9044b0e47b975 Mon Sep 17 00:00:00 2001
From: Marco Neuhaus <mneuhaus44@gmail.com>
Date: Wed, 22 May 2019 23:53:05 +0200
Subject: [PATCH] fix particle rewrites

---
 .../packets/BlockItemPackets1_14.java         |  2 ++
 .../packets/EntityPackets1_14.java            | 20 +++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java
index 5a89863e..1dffe303 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java
@@ -511,12 +511,14 @@ public class BlockItemPackets1_14 extends BlockItemRewriter<Protocol1_13_2To1_14
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
                         int id = wrapper.get(Type.INT, 0);
+                        id = EntityPackets1_14.getOldParticleId(id);
                         if (id == 3 || id == 20) {
                             int data = wrapper.passthrough(Type.VAR_INT);
                             wrapper.set(Type.VAR_INT, 0, Protocol1_14To1_13_2.getNewBlockStateId(data));
                         } else if (id == 27) {
                             handleItemToClient(wrapper.passthrough(Type.FLAT_VAR_INT_ITEM));
                         }
+                        wrapper.set(Type.INT, 0, id);
                     }
                 });
             }
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java
index 0a8002d6..8b91fae0 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java
@@ -543,20 +543,20 @@ public class EntityPackets1_14 extends EntityRewriter<Protocol1_13_2To1_14> {
     }
 
     public static int getOldParticleId(int id) {
-        if (id >= 12) {
-            id -= 2; // new lava drips 10, 11
-        }
-        if (id >= 14) {
-            id -= 1; // new water drip 11 -> 13
-        }
-        if (id >= 28) {
-            id -= 1; // new 24 -> 27
+        if (id >= 45) {
+            id -= 1; // new 39 -> 44
         }
         if (id >= 30) {
             id -= 1; // skip new short happy villager
         }
-        if (id >= 45) {
-            id -= 1; // new 39 -> 44
+        if (id >= 28) {
+            id -= 1; // new 24 -> 27
+        }
+        if (id >= 14) {
+            id -= 1; // new water drip 11 -> 13
+        }
+        if (id >= 12) {
+            id -= 2; // new lava drips 10, 11
         }
         return id;
     }