From 039a9f4ab5f24e7f7135e35ba648b61c52f4b25b Mon Sep 17 00:00:00 2001
From: Konicai <71294714+konicai@users.noreply.github.com>
Date: Fri, 8 Sep 2023 17:15:20 -0400
Subject: [PATCH] Reply to ClientboundStartConfigurationPacket

---
 .../steveice10/mc/protocol/ClientListener.java       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/github/steveice10/mc/protocol/ClientListener.java b/src/main/java/com/github/steveice10/mc/protocol/ClientListener.java
index 673721834..22d669128 100644
--- a/src/main/java/com/github/steveice10/mc/protocol/ClientListener.java
+++ b/src/main/java/com/github/steveice10/mc/protocol/ClientListener.java
@@ -18,6 +18,7 @@
 import com.github.steveice10.mc.protocol.packet.common.clientbound.ClientboundKeepAlivePacket;
 import com.github.steveice10.mc.protocol.packet.common.serverbound.ServerboundKeepAlivePacket;
 import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundStartConfigurationPacket;
+import com.github.steveice10.mc.protocol.packet.ingame.serverbound.ServerboundConfigurationAcknowledgedPacket;
 import com.github.steveice10.mc.protocol.packet.login.clientbound.ClientboundGameProfilePacket;
 import com.github.steveice10.mc.protocol.packet.login.clientbound.ClientboundHelloPacket;
 import com.github.steveice10.mc.protocol.packet.login.clientbound.ClientboundLoginCompressionPacket;
@@ -90,7 +91,6 @@ public void packetReceived(Session session, Packet packet) {
                 session.enableEncryption(protocol.enableEncryption(key));
             } else if (packet instanceof ClientboundGameProfilePacket) {
                 session.send(new ServerboundLoginAcknowledgedPacket());
-                protocol.setState(ProtocolState.CONFIGURATION);
             } else if (packet instanceof ClientboundLoginDisconnectPacket) {
                 session.disconnect(((ClientboundLoginDisconnectPacket) packet).getReason());
             } else if (packet instanceof ClientboundLoginCompressionPacket) {
@@ -120,7 +120,7 @@ public void packetReceived(Session session, Packet packet) {
             } else if (packet instanceof ClientboundDisconnectPacket) {
                 session.disconnect(((ClientboundDisconnectPacket) packet).getReason());
             } else if (packet instanceof ClientboundStartConfigurationPacket) {
-                protocol.setState(ProtocolState.CONFIGURATION);
+                session.send(new ServerboundConfigurationAcknowledgedPacket());
             }
         } else if (protocol.getState() == ProtocolState.CONFIGURATION) {
             if (packet instanceof ClientboundFinishConfigurationPacket) {
@@ -131,9 +131,9 @@ public void packetReceived(Session session, Packet packet) {
 
     @Override
     public void packetSent(Session session, Packet packet) {
+        MinecraftProtocol protocol = (MinecraftProtocol) session.getPacketProtocol();
         if (packet instanceof ClientIntentionPacket) {
             // Once the HandshakePacket has been sent, switch to the next protocol mode.
-            MinecraftProtocol protocol = (MinecraftProtocol) session.getPacketProtocol();
             protocol.setState(this.targetState);
 
             if (this.targetState == ProtocolState.LOGIN) {
@@ -142,8 +142,12 @@ public void packetSent(Session session, Packet packet) {
             } else {
                 session.send(new ServerboundStatusRequestPacket());
             }
+        } else if (packet instanceof ServerboundLoginAcknowledgedPacket) {
+            protocol.setState(ProtocolState.CONFIGURATION); // LOGIN -> CONFIGURATION
         } else if (packet instanceof ServerboundFinishConfigurationPacket) {
-            ((MinecraftProtocol) session.getPacketProtocol()).setState(ProtocolState.GAME);
+            protocol.setState(ProtocolState.GAME); // CONFIGURATION -> GAME
+        } else if (packet instanceof ServerboundConfigurationAcknowledgedPacket) {
+            protocol.setState(ProtocolState.CONFIGURATION); // GAME -> CONFIGURATION
         }
     }