From 00f2973e834f038813bda6a826f4527c915364c8 Mon Sep 17 00:00:00 2001
From: Elysia <71698422+aiko-chan-ai@users.noreply.github.com>
Date: Mon, 10 Mar 2025 11:40:46 +0700
Subject: [PATCH] fix(ClientVoiceManager): voice state update handling

#1520
---
 src/client/voice/ClientVoiceManager.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/client/voice/ClientVoiceManager.js b/src/client/voice/ClientVoiceManager.js
index 0862db1..3ec61eb 100644
--- a/src/client/voice/ClientVoiceManager.js
+++ b/src/client/voice/ClientVoiceManager.js
@@ -60,6 +60,13 @@ class ClientVoiceManager {
 
   onVoiceStateUpdate(payload) {
     const { guild_id, session_id, channel_id } = payload;
+    // @discordjs/voice
+    if (payload.guild_id && payload.session_id && payload.user_id === this.client.user?.id) {
+      this.adapters.get(payload.guild_id)?.onVoiceStateUpdate(payload);
+    } else if (payload.channel_id && payload.session_id && payload.user_id === this.client.user?.id) {
+      this.adapters.get(payload.channel_id)?.onVoiceStateUpdate(payload);
+    }
+    // Main lib
     const connection = this.connection;
     this.client.emit('debug', `[VOICE] connection? ${!!connection}, ${guild_id} ${session_id} ${channel_id}`);
     if (!connection) return;
@@ -76,12 +83,6 @@ class ClientVoiceManager {
       this.client.emit('debug', `[VOICE] disconnecting from guild ${guild_id} as channel ${channel_id} is uncached`);
       connection.disconnect();
     }
-    // Djs Voice
-    if (payload.guild_id && payload.session_id && payload.user_id === this.client.user?.id) {
-      this.adapters.get(payload.guild_id)?.onVoiceStateUpdate(payload);
-    } else if (payload.channel_id && payload.session_id && payload.user_id === this.client.user?.id) {
-      this.adapters.get(payload.channel_id)?.onVoiceStateUpdate(payload);
-    }
   }
 
   /**