From a5d68950de72f8dd3d7737d97b41c2b13b76e0e9 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 24 Feb 2018 21:35:12 -0500 Subject: [PATCH] testing --- commands/Pokemon/claim.js | 5 +++-- commands/Pokemon/drop.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/commands/Pokemon/claim.js b/commands/Pokemon/claim.js index aa891ef..d35b5d2 100644 --- a/commands/Pokemon/claim.js +++ b/commands/Pokemon/claim.js @@ -2,10 +2,11 @@ exports.run = async (bot, msg) => { if (!msg.channel.topic.startsWith('Current Owner:')) return msg.reply('Go into one of the gym channels and try again.'); if (msg.channel.topic == 'Current Owner: *none*') { msg.reply('Alright, you have claimed this gym as yours! Be ready to battle anyone who approaches you'); - msg.channel.setTopic('Current Owner: ' + msg.author.tag + '/' + msg.author.id); + msg.channel.setTopic('Current Owner: ' + msg.author.id + '/' + msg.author.tag); } else { - const owner = msg.channel.topic.slice(15).substring(msg.author.tag.length - 1); + + const owner = msg.channel.topic.slice(15).substring(19); msg.channel.send('<@' + owner + '>, come here as ' + msg.member.displayName + ' wants to battle you.'); } }; diff --git a/commands/Pokemon/drop.js b/commands/Pokemon/drop.js index fd3bc2d..8d822a6 100644 --- a/commands/Pokemon/drop.js +++ b/commands/Pokemon/drop.js @@ -4,7 +4,7 @@ exports.run = async (bot, msg) => { msg.reply('There is no owner for this gym. Claim it now with p:claim!'); } else { - const owner = msg.channel.topic.slice(15).substring(msg.author.tag.length - 1); + const owner = msg.channel.topic.slice(15).substring(19); if (msg.author.id != owner) { return msg.reply('You are not the owner of this gym.'); }