cwchristerw/musix-oss
1
0
Fork 0
mirror of https://github.com/musix-org/musix-oss synced 2024-12-23 00:23:17 +00:00
Code

Merge branch 'master' of https://github.com/MatteZ02/Musix-V2

Browse Source
This commit is contained in:
MatteZ02 2019-12-05 15:17:17 +02:00
commit 60b9fc6b9b
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
commands/loop.js
View File

@ -9,7 +9,6 @@ module.exports = {
const permissions = message.channel.permissionsFor(message.author); const permissions = message.channel.permissionsFor(message.author);
const { voiceChannel } = message.member; const { voiceChannel } = message.member;
if (!serverQueue) return message.channel.send(':x: There is nothing playing.'); if (!serverQueue) return message.channel.send(':x: There is nothing playing.');
if (serverQueue.playing) {
if (message.author.id !== client.config.devId) { if (message.author.id !== client.config.devId) {
if (voiceChannel !== serverQueue.voiceChannel) return message.channel.send(':x: I\'m sorry but you need to be in the same voice channel as Musix to loop the queue!'); if (voiceChannel !== serverQueue.voiceChannel) return message.channel.send(':x: I\'m sorry but you need to be in the same voice channel as Musix to loop the queue!');
if (client.global.db.guilds[message.guild.id].permissions === true) { if (client.global.db.guilds[message.guild.id].permissions === true) {
@ -25,8 +24,5 @@ module.exports = {
serverQueue.looping = false; serverQueue.looping = false;
message.channel.send(':repeat: No longer looping the queue!'); message.channel.send(':repeat: No longer looping the queue!');
} }
} else {
message.channel.send(':x: There is nothing playing!');
}
} }
}; };

1
commands/queue.js
View File

@ -7,7 +7,6 @@ module.exports = {
async execute(message, args, client, Discord, prefix) { async execute(message, args, client, Discord, prefix) {
const serverQueue = client.queue.get(message.guild.id); const serverQueue = client.queue.get(message.guild.id);
if (!serverQueue) return message.channel.send(':x: There is nothing playing.'); if (!serverQueue) return message.channel.send(':x: There is nothing playing.');
if (!serverQueue.playing) return message.channel.send(':x: There is nothing playing.');
if (args[1]) { if (args[1]) {
if (isNaN(args[1])) return msg.channel.send(':x: I\'m sorry, But you need to enter a valid __number__.'); if (isNaN(args[1])) return msg.channel.send(':x: I\'m sorry, But you need to enter a valid __number__.');
} }