magmastream 2.9.0-dev.18 → 2.9.0-dev.19

package/dist/structures/Player.js

@@ -224,20 +224,27 @@ class Player {
      */
     async destroy(disconnect = true) {
         const oldPlayer = this ? { ...this } : null;
+        if (this.state === Utils_1.StateTypes.Destroying || this.state === Utils_1.StateTypes.Disconnected) {
+            console.debug(`[Player#destroy] Already destroying/destroyed for ${this.guildId}`);
+            return false;
+        }
         this.state = Utils_1.StateTypes.Destroying;
         if (disconnect) {
-            await this.disconnect();
+            await this.disconnect().catch((err) => {
+                console.warn(`[Player#destroy] Failed to disconnect player ${this.guildId}:`, err);
+            });
         }
-        await this.node.rest.destroyPlayer(this.guildId);
+        await this.node.rest.destroyPlayer(this.guildId).catch((err) => {
+            console.warn(`[Player#destroy] REST failed to destroy player ${this.guildId}:`, err);
+        });
         await this.queue.clear();
+        await this.queue.clearPrevious();
+        await this.queue.setCurrent(null);
         this.manager.emit(Manager_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, null, {
             changeType: Manager_1.PlayerStateEventTypes.PlayerDestroy,
         });
         this.manager.emit(Manager_1.ManagerEventTypes.PlayerDestroy, this);
         const deleted = this.manager.players.delete(this.guildId);
-        if (!deleted) {
-            console.warn(`Failed to delete player with guildId: ${this.guildId}`);
-        }
         return deleted;
     }
     /**
@@ -665,7 +672,10 @@ class Player {
         // Store the current track before changing it.
         // let currentTrackBeforeChange: Track | null = this.queue.current ? (this.queue.current as Track) : null;
         // Get the last played track and remove it from the history
-        const lastTrack = (await this.queue.getPrevious()).pop();
+        const previousTracks = await this.queue.getPrevious();
+        const lastTrack = previousTracks.pop();
+        await this.queue.clearPrevious();
+        await this.queue.addPrevious(previousTracks);
         // Set the skip flag to true to prevent the onTrackEnd event from playing the next track.
         this.set("skipFlag", true);
         await this.play(lastTrack);