From fdae2d778c01b3a725230609207ff5670662f714 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 27 Mar 2018 19:43:41 -0400 Subject: Revert "welcome to the new claim command" This reverts commit 4ce48074d53d128edb4b944e931f30f6f7f48ae2. --- commands/Pokemon/claim.js | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'commands') diff --git a/commands/Pokemon/claim.js b/commands/Pokemon/claim.js index 1c9bd32..3f4afed 100644 --- a/commands/Pokemon/claim.js +++ b/commands/Pokemon/claim.js @@ -36,7 +36,6 @@ exports.run = async (bot, msg) => { if (!team) return msg.reply('You have to join a team before you can claim a 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.'); - if (bot.gyms.get(msg.channel.id) != null) return msg.reply('Nope, someone is already battling the gym.'); msg.channel.send('<@' + owner + '>, come here as ' + msg.member.displayName + ' wants to battle you.'); const func = async mess => { if (mess.channel != msg.channel) return; @@ -55,30 +54,16 @@ exports.run = async (bot, msg) => { bot.removeListener('message', func); } if (user.id == msg.author.id) { - await msg.channel.send('The owner has been defeated! Transferring gym!'); - bot.cooldown.push(msg.channel.id); - let lastProcessedHour = -1; - setInterval(function() { - const d = new Date(); - const currentHour = d.getHours(); - if (currentHour != lastProcessedHour) { - const index = bot.cooldown.indexOf(msg.channel.id); - if (index !== -1) bot.cooldown.splice(index, 1); - - lastProcessedHour = currentHour; - } - }, 1000); + await msg.channel.send('The owner has been defeated! Transfaring gym!'); let recipientTeam; if (msg.member.roles.find('name', 'Skull')) recipientTeam = 'Skull'; if (msg.member.roles.find('name', 'Flare')) recipientTeam = 'Flare'; await msg.channel.setTopic('Current Owner: ' + msg.member.id + '/' + msg.author.tag + '/' + recipientTeam); - bot.gyms.set(msg.channel.id, null); bot.removeListener('message', func); } } } }; - bot.gyms.set(msg.channel.id, func); bot.on('message', func); } }; -- cgit v1.2.3