From 5d4b104b339a246f2e26c291c3b545250b8e978d Mon Sep 17 00:00:00 2001
From: Aeltumn <12281102+Aeltumn@users.noreply.github.com>
Date: Sat, 16 Dec 2023 07:20:53 -0800
Subject: [PATCH] Try to schedule sending on switch (#3587)

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

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 660a01b97..c6b549373 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
@@ -103,7 +103,9 @@ public final class EntityPacketRewriter1_20_2 extends EntityRewriter<Clientbound
                         // No change, so no need to re-enter the configuration state - just let this one through
                         final PacketWrapper clientInformationPacket = configurationBridge.clientInformationPacket(wrapper.user());
                         if (clientInformationPacket != null) {
-                            clientInformationPacket.sendToServer(Protocol1_20_2To1_20.class);
+                            // Schedule the sending to ensure it arrives later, this fixes an issue where on
+                            // servers running < 1.20.2 a client changing servers on a proxy lost skin layers
+                            clientInformationPacket.scheduleSendToServer(Protocol1_20_2To1_20.class);
                         }
                         return;
                     }