diff options
| -rw-r--r-- | commands/Pokemon/claim.js | 1 | ||||
| -rw-r--r-- | commands/Utility/nick.js | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/commands/Pokemon/claim.js b/commands/Pokemon/claim.js index f9e71ee..e7b687c 100644 --- a/commands/Pokemon/claim.js +++ b/commands/Pokemon/claim.js @@ -35,6 +35,7 @@ exports.run = async (bot, msg) => { if (msg.member.roles.find('name', 'Rocket')) team = 'Rocket'; if (msg.member.roles.find('name', 'Magma')) team = 'Magma'; if (!team) return msg.reply('You have to join a team before you can claim a gym.'); + if (msg.channel.name == 'gym-chara') return msg.reply('You can\'t battle in this gym') const owner = msg.channel.topic.slice(15).substring(0, 18); if (msg.guild.members.find('id', owner).roles.find('name', team)) return msg.reply('Don\'t try battling your own team. They won\'t like you.'); msg.channel.send('<@' + owner + '>, come here as ' + msg.member.displayName + ' wants to battle you.'); diff --git a/commands/Utility/nick.js b/commands/Utility/nick.js index e652087..1dd5cb6 100644 --- a/commands/Utility/nick.js +++ b/commands/Utility/nick.js @@ -23,7 +23,6 @@ exports.run = async (bot, msg, args) => { msg.member.setNickname(args.join(' '), 'Requested by bot'); msg.channel.send('Changed nickname to: ' + args.join(' ')); - setTimeout(null, 3000); bot.channels.find('name', 'logs').send( new RichEmbed() .setColor(0x00ae86) |