From e715e4fbe16cbeb03edd2ef1348711cd9076479d Mon Sep 17 00:00:00 2001
From: Skick <skick1234@gmail.com>
Date: Sun, 1 Nov 2020 20:37:16 +0700
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Throw=20Error=20instead=20?=
 =?UTF-8?q?of=20Message=20(#101)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Androz <androz2091@gmail.com>
---
 README.md     |  2 +-
 src/Player.js | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 0b31c32..b7e4404 100644
--- a/README.md
+++ b/README.md
@@ -136,7 +136,7 @@ client.player
 .on('botDisconnect', (message, queue) => message.channel.send('Music stopped as I have been disconnected from the channel!'))
 
 // Error handling
-.on('error', (message, error) => {
+.on('error', (error, message) => {
     switch(error){
         case 'NotPlaying':
             message.channel.send('There is no music being played on this server!')
diff --git a/src/Player.js b/src/Player.js
index 79ae4e7..8c2c6de 100644
--- a/src/Player.js
+++ b/src/Player.js
@@ -310,7 +310,7 @@ class Player extends EventEmitter {
             this.emit('playlistAdd', message, queue, playlist)
         } else {
             const track = playlist.tracks.shift()
-            const queue = await this._createQueue(message, track).catch((e) => this.emit('error', message, e))
+            const queue = await this._createQueue(message, track).catch((e) => this.emit('error', e, message))
             this.emit('trackStart', message, queue.tracks[0])
             this._addTracksToQueue(message, playlist.tracks)
         }
@@ -379,7 +379,7 @@ class Player extends EventEmitter {
     resume (message) {
         // Get guild queue
         const queue = this.queues.find((g) => g.guildID === message.guild.id)
-        if (!queue) return this.emit('error', message, 'NotPlaying')
+        if (!queue) return this.emit('error', 'NotPlaying', message)
         // Pause the dispatcher
         queue.voiceConnection.dispatcher.resume()
         queue.paused = false
@@ -396,7 +396,7 @@ class Player extends EventEmitter {
     stop (message) {
         // Get guild queue
         const queue = this.queues.find((g) => g.guildID === message.guild.id)
-        if (!queue) return this.emit('error', message, 'NotPlaying')
+        if (!queue) return this.emit('error', 'NotPlaying', message)
         // Stop the dispatcher
         queue.stopped = true
         queue.tracks = []
@@ -417,7 +417,7 @@ class Player extends EventEmitter {
     setVolume (message, percent) {
         // Get guild queue
         const queue = this.queues.get(message.guild.id)
-        if (!queue) return this.emit('error', message, 'NotPlaying')
+        if (!queue) return this.emit('error', 'NotPlaying', message)
         // Update volume
         queue.volume = percent
         queue.voiceConnection.dispatcher.setVolumeLogarithmic(queue.calculatedVolume / 200)
@@ -444,7 +444,7 @@ class Player extends EventEmitter {
     clearQueue (message) {
         // Get guild queue
         const queue = this.queues.get(message.guild.id)
-        if (!queue) return this.emit('error', message, 'NotPlaying')
+        if (!queue) return this.emit('error', 'NotPlaying', message)
         // Clear queue
         queue.tracks = []
         // Return the queue
@@ -459,7 +459,7 @@ class Player extends EventEmitter {
     skip (message) {
         // Get guild queue
         const queue = this.queues.get(message.guild.id)
-        if (!queue) return this.emit('error', message, 'NotPlaying')
+        if (!queue) return this.emit('error', 'NotPlaying', message)
         const currentTrack = queue.playing
         // End the dispatcher
         queue.voiceConnection.dispatcher.end()
@@ -476,7 +476,7 @@ class Player extends EventEmitter {
     nowPlaying (message) {
         // Get guild queue
         const queue = this.queues.get(message.guild.id)
-        if (!queue) return this.emit('error', message, 'NotPlaying')
+        if (!queue) return this.emit('error', 'NotPlaying', message)
         const currentTrack = queue.tracks[0]
         // Return the current track
         return currentTrack
@@ -491,7 +491,7 @@ class Player extends EventEmitter {
     setRepeatMode (message, enabled) {
         // Get guild queue
         const queue = this.queues.get(message.guild.id)
-        if (!queue) return this.emit('error', message, 'NotPlaying')
+        if (!queue) return this.emit('error', 'NotPlaying', message)
         // Enable/Disable repeat mode
         queue.repeatMode = enabled
         // Return the repeat mode
@@ -506,7 +506,7 @@ class Player extends EventEmitter {
     shuffle (message) {
         // Get guild queue
         const queue = this.queues.get(message.guild.id)
-        if (!queue) return this.emit('error', message, 'NotPlaying')
+        if (!queue) return this.emit('error', 'NotPlaying', message)
         // Shuffle the queue (except the first track)
         const currentTrack = queue.tracks.shift()
         queue.tracks = queue.tracks.sort(() => Math.random() - 0.5)
@@ -524,7 +524,7 @@ class Player extends EventEmitter {
     remove (message, track) {
         // Get guild queue
         const queue = this.queues.get(message.guild.id)
-        if (!queue) return this.emit('error', message, 'NotPlaying')
+        if (!queue) return this.emit('error', 'NotPlaying', message)
         // Remove the track from the queue
         let trackFound = null
         if (typeof track === 'number') {