From d600b0cbe159d63850d20ea46db7b1d7ae866e94 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Wed, 11 Oct 2023 00:06:48 +1000
Subject: [PATCH] Queue join game first, then send config packets

---
 .../rewriter/EntityPacketRewriter1_20_2.java                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java
index 48c344b25..8d76a221e 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java
@@ -119,11 +119,11 @@ public final class EntityPacketRewriter1_20_2 extends EntityRewriter<Clientbound
                         return;
                     }
 
-                    Protocol1_20_2To1_20.sendConfigurationPackets(wrapper.user(), dimensionRegistry, null);
-
-                    // Manually send it at the end and hope nothing breaks
+                    // Queue it and send it after the client acks the configuration finish
                     configurationBridge.setJoinGamePacket(wrapper);
                     wrapper.cancel();
+
+                    Protocol1_20_2To1_20.sendConfigurationPackets(wrapper.user(), dimensionRegistry, null);
                 });
                 handler(worldDataTrackerHandlerByKey()); // Tracks world height and name for chunk data and entity (un)tracking
             }