From fdb7f477492578288b900a8cabed84bda5c10c40 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Tue, 3 Oct 2023 20:54:51 +1000
Subject: [PATCH] Properly throw the client information packet into the queue
 instead

---
 .../rewriter/EntityPacketRewriter1_20_2.java       |  5 ++++-
 .../storage/ConfigurationState.java                | 14 +++++++++-----
 2 files changed, 13 insertions(+), 6 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 74761c67c..f00ca14c8 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
@@ -101,7 +101,10 @@ public final class EntityPacketRewriter1_20_2 extends EntityRewriter<Clientbound
                     final ConfigurationState configurationBridge = wrapper.user().get(ConfigurationState.class);
                     if (!configurationBridge.setLastDimensionRegistry(dimensionRegistry)) {
                         // No change, so no need to re-enter the configuration state - just let this one through
-                        configurationBridge.sendClientInformation(wrapper.user());
+                        final PacketWrapper clientInformationPacket = configurationBridge.clientInformationPacket(wrapper.user());
+                        if (clientInformationPacket != null) {
+                            clientInformationPacket.sendToServer(Protocol1_20_2To1_20.class);
+                        }
                         return;
                     }
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/storage/ConfigurationState.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/storage/ConfigurationState.java
index be41255f6..5d81f87e4 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/storage/ConfigurationState.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/storage/ConfigurationState.java
@@ -106,12 +106,16 @@ public class ConfigurationState implements StorableObject {
     }
 
     public void sendQueuedPackets(final UserConnection connection) throws Exception {
-        if (joinGamePacket != null) {
+        final boolean hasJoinGamePacket = joinGamePacket != null;
+        if (hasJoinGamePacket) {
             packetQueue.add(0, joinGamePacket);
             joinGamePacket = null;
         }
 
-        sendClientInformation(connection);
+        final PacketWrapper clientInformationPacket = clientInformationPacket(connection);
+        if (clientInformationPacket != null) {
+            packetQueue.add(hasJoinGamePacket ? 1 : 0, toQueuedPacket(clientInformationPacket, false, true));
+        }
 
         final ConfigurationState.QueuedPacket[] queuedPackets = packetQueue.toArray(new ConfigurationState.QueuedPacket[0]);
         packetQueue.clear();
@@ -151,10 +155,10 @@ public class ConfigurationState implements StorableObject {
         NONE, PROFILE_SENT, CONFIGURATION, REENTERING_CONFIGURATION
     }
 
-    public void sendClientInformation(final UserConnection connection) throws Exception {
+    public @Nullable PacketWrapper clientInformationPacket(final UserConnection connection) {
         if (clientInformation == null) {
             // Should never be null, but we also shouldn't error
-            return;
+            return null;
         }
 
         final PacketWrapper settingsPacket = PacketWrapper.create(ServerboundPackets1_19_4.CLIENT_SETTINGS, connection);
@@ -166,7 +170,7 @@ public class ConfigurationState implements StorableObject {
         settingsPacket.write(Type.VAR_INT, clientInformation.mainHand);
         settingsPacket.write(Type.BOOLEAN, clientInformation.textFiltering);
         settingsPacket.write(Type.BOOLEAN, clientInformation.allowListing);
-        settingsPacket.scheduleSendToServer(Protocol1_20_2To1_20.class);
+        return settingsPacket;
     }
 
     public static final class QueuedPacket {