From 6fb9f9adf35807b93b97723dc4731fc2d4bce9aa Mon Sep 17 00:00:00 2001
From: Matsv <mats@matsv.nl>
Date: Sat, 16 Mar 2019 16:03:32 +0100
Subject: [PATCH] :sos: Hacky way to fix flower pots

---
 .../packets/BlockItemPackets1_13.java           | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java
index 7a5cabf5..f6102ff4 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java
@@ -1098,19 +1098,32 @@ public class BlockItemPackets1_13 extends BlockItemRewriter<Protocol1_12_2To1_13
         return item;
     }
 
+    // TODO find a less hacky way to do this (https://bugs.mojang.com/browse/MC-74231)
     private static void flowerPotSpecialTreatment(UserConnection user, int blockState, Position position) throws Exception {
         if (FlowerPotHandler.isFlowah(blockState)) {
             BackwardsBlockEntityProvider beProvider = Via.getManager().getProviders().get(BackwardsBlockEntityProvider.class);
 
             CompoundTag nbt = beProvider.transform(user, position, "minecraft:flower_pot");
 
+            // Remove the flowerpot
+            PacketWrapper blockUpdateRemove = new PacketWrapper(0x0B, null, user);
+            blockUpdateRemove.write(Type.POSITION, position);
+            blockUpdateRemove.write(Type.VAR_INT, 0);
+            blockUpdateRemove.send(Protocol1_12_2To1_13.class, true);
+
+            // Create the flowerpot
+            PacketWrapper blockCreate = new PacketWrapper(0x0B, null, user);
+            blockCreate.write(Type.POSITION, position);
+            blockCreate.write(Type.VAR_INT, toOldId(blockState));
+            blockCreate.send(Protocol1_12_2To1_13.class, true);
+
+            // Send a block entity update
             PacketWrapper wrapper = new PacketWrapper(0x09, null, user);
             wrapper.write(Type.POSITION, position);
             wrapper.write(Type.UNSIGNED_BYTE, (short) 5);
             wrapper.write(Type.NBT, nbt);
-
-            // TODO Why does this not work?
             wrapper.send(Protocol1_12_2To1_13.class, true);
+
         }
     }
 }