From 64c11b1f8f7133942c7a0cfc39552de29eab5fdd Mon Sep 17 00:00:00 2001
From: RK_01 <50594595+RaphiMC@users.noreply.github.com>
Date: Wed, 8 Dec 2021 12:49:13 +0100
Subject: [PATCH] Fixed 1.9 -> 1.8 potion metadata packet order (#2765)

---
 .../protocols/protocol1_9to1_8/packets/SpawnPackets.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/SpawnPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/SpawnPackets.java
index e52427b63..2d52ec066 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/SpawnPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/SpawnPackets.java
@@ -114,7 +114,7 @@ public class SpawnPackets {
                         int typeID = wrapper.get(Type.BYTE, 0);
                         if (Entity1_10Types.getTypeFromId(typeID, true) == Entity1_10Types.EntityType.SPLASH_POTION) {
                             // Convert this to meta data, woo!
-                            PacketWrapper metaPacket = wrapper.create(0x39, new PacketHandler() {
+                            PacketWrapper metaPacket = wrapper.create(ClientboundPackets1_9.ENTITY_METADATA, new PacketHandler() {
                                 @Override
                                 public void handle(PacketWrapper wrapper) throws Exception {
                                     wrapper.write(Type.VAR_INT, entityID);
@@ -127,7 +127,10 @@ public class SpawnPackets {
                                     wrapper.write(Types1_9.METADATA_LIST, meta);
                                 }
                             });
-                            metaPacket.scheduleSend(Protocol1_9To1_8.class);
+                            // Fix packet order
+                            wrapper.send(Protocol1_9To1_8.class);
+                            metaPacket.send(Protocol1_9To1_8.class);
+                            wrapper.cancel();
                         }
                     }
                 });