From d4e0f546fa1d35a9115df85be1eec3508fe45800 Mon Sep 17 00:00:00 2001
From: 8cy <50817549+8cy@users.noreply.github.com>
Date: Mon, 13 Apr 2020 00:02:08 -0700
Subject: fix join, v1.1.1

---
 bot.js                 | 2 +-
 commands/voice/join.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bot.js b/bot.js
index faf11ff..d844105 100644
--- a/bot.js
+++ b/bot.js
@@ -36,7 +36,7 @@ client.registry
 
 client.once('ready', () => { 
     console.log(`Started bot: ${client.user.tag} (ID: ${client.user.id})\nCurrently running on ${client.guilds.cache.size} server(s).`);
-    client.user.setActivity('msb!h | v1.1.0', {
+    client.user.setActivity('msb!h | v1.1.1', {
         type: 'LISTENING'
     });
     //client.channels.cache.get('600773421525237781').send('bot started up');
diff --git a/commands/voice/join.js b/commands/voice/join.js
index 2dc1fdd..cac5e50 100644
--- a/commands/voice/join.js
+++ b/commands/voice/join.js
@@ -14,10 +14,10 @@ module.exports = class JoinVoice extends Command {
         });
     }
     run(msg) {
-        if (!msg.guild.voice && msg.member.voice.channel) {
+        if (msg.guild.musicData.isPlaying == false && msg.member.voice.channel) {
             msg.member.voice.channel.join();
             msg.reply('Succesfully joined your voice channel. ' + emoji.random());
-        } else if (msg.guild.voice) {
+        } else if (msg.guild.musicData.isPlaying == false) {
             msg.reply('I\'m already in voice channel. ' + emoji.random());
         } else if (!msg.member.voice.channel) {
             msg.reply('You\'re not in a voice channel. ' + emoji.random());
-- 
cgit v1.2.3