Acknowledge native conn state changes in JS

retrixe · retrixe · commit 2ba981acf50e · 2025-02-03T14:36:56.000+05:30
Fixed a bug with Velocity where ACK_FINISH_CONFIG was sent prior to
KNOWN_PACKS, causing the backend to interpret it as a chat message.
diff --git a/android/app/src/main/java/com/enderchat/modules/connection/ConnectionModule.kt b/android/app/src/main/java/com/enderchat/modules/connection/ConnectionModule.kt
@@ -262,17 +262,17 @@ class ConnectionModule(reactContext: ReactApplicationContext)
                             compressionEnabled = threshold >= 0
                         } else if (packet.id.value == ids.loginSuccess && state == ConnectionState.LOGIN) {
                             state = if (protocolVersion >= PROTOCOL_VERSION_1202) {
-                                directlyWritePacket(ids.loginAcknowledged, ByteArray(0))
+                                // directlyWritePacket(ids.loginAcknowledged, ByteArray(0))
                                 ConnectionState.CONFIGURATION
                             } else ConnectionState.PLAY
                         } else if (packet.id.value == ids.finishConfigurationClientBound &&
                             state == ConnectionState.CONFIGURATION) {
                             state = ConnectionState.PLAY
-                            directlyWritePacket(ids.finishConfigurationServerBound, ByteArray(0))
+                            // directlyWritePacket(ids.finishConfigurationServerBound, ByteArray(0))
                         } else if (packet.id.value == ids.startConfigurationClientBound &&
                             state == ConnectionState.PLAY) {
                             state = ConnectionState.CONFIGURATION
-                            directlyWritePacket(ids.acknowledgeConfigurationServerBound, ByteArray(0))
+                            // directlyWritePacket(ids.acknowledgeConfigurationServerBound, ByteArray(0))
                         }
 
                         // Forward the packet to JavaScript.
diff --git a/src/minecraft/connection/native.ts b/src/minecraft/connection/native.ts
@@ -103,19 +103,29 @@ export class NativeServerConnection extends events.EventEmitter implements Serve
           this.state === ConnectionState.LOGIN
         ) {
           this.state =
-            version >= protocolMap['1.20.2']
-              ? ConnectionState.CONFIGURATION // Ack sent by native code
-              : ConnectionState.PLAY
+            version >= protocolMap['1.20.2'] ? ConnectionState.CONFIGURATION : ConnectionState.PLAY
+          this.writePacket(
+            packetIds.SERVERBOUND_LOGIN_ACKNOWLEDGED(version) ?? 0,
+            Buffer.alloc(0),
+          ).catch((err: unknown) => this.emit('error', err))
         } else if (
           packet.id === packetIds.CLIENTBOUND_FINISH_CONFIGURATION(version) &&
           this.state === ConnectionState.CONFIGURATION
         ) {
-          this.state = ConnectionState.PLAY // Ack sent by native code
+          this.state = ConnectionState.PLAY
+          this.writePacket(
+            packetIds.SERVERBOUND_ACK_FINISH_CONFIGURATION(version) ?? 0,
+            Buffer.alloc(0),
+          ).catch((err: unknown) => this.emit('error', err))
         } else if (
           packet.id === packetIds.CLIENTBOUND_START_CONFIGURATION(version) &&
           this.state === ConnectionState.PLAY
         ) {
-          this.state = ConnectionState.CONFIGURATION // Ack sent by native code
+          this.state = ConnectionState.CONFIGURATION
+          this.writePacket(
+            packetIds.SERVERBOUND_ACKNOWLEDGE_CONFIGURATION(version) ?? 0,
+            Buffer.alloc(0),
+          ).catch((err: unknown) => this.emit('error', err))
         } else if (
           (packet.id === packetIds.CLIENTBOUND_DISCONNECT_LOGIN(version) &&
             this.state === ConnectionState.LOGIN) ||
