try this stupid thing

1 files changed, 9 insertions, 3 deletions

diff --git a/commands/Pokemon/claim.js b/commands/Pokemon/claim.js
index ac84930..de7e355 100644
--- a/commands/Pokemon/claim.js
+++ b/commands/Pokemon/claim.js
@@ -40,18 +40,24 @@ exports.run = async (bot, msg) => {
     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.');
     bot.on('message', mess => {
-      const field = mess.embeds[0].description.split('\n')[0].split(' ')[0];
+      let field = mess.embeds[0];
+      if (!field) return;
+      field = field.description;
+      if (!field) return;
+      field = field.split('\n')[0];
+      if (!field) return;
+      field = field.split(' ')[0];
       if (field != undefined) {
         const user = msg.guild.members.find(member => member.user.username === field);
         if (user != undefined) {
           if (user.id == owner) return msg.channel.send('The owner has not been defeated!');
-          if (user.id == msg.user.id) {
+          if (user.id == msg.author.id) {
             msg.channel.send('The owner has been defeated! Transfaring gym!');
             let recipientTeam;
             if (msg.member.roles.find('name', 'Aqua')) recipientTeam = 'Aqua';
             if (msg.member.roles.find('name', 'Rocket')) recipientTeam = 'Rocket';
             if (msg.member.roles.find('name', 'Magma')) recipientTeam = 'Magma';
-            msg.channel.setTopic('Current Owner: ' + msg.member.id + '/' + msg.user.tag + '/' + recipientTeam);
+            msg.channel.setTopic('Current Owner: ' + msg.member.id + '/' + msg.author.tag + '/' + recipientTeam);
           }
         }
       }