getTags and findTag update

notbeer · Aug 22, 2021 · 1c8e9f9 · 1c8e9f9
1 parent 6e81001
commit 1c8e9f9
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/scripts/library/structures/classes/entity.js b/scripts/library/structures/classes/entity.js
@@ -3,24 +3,25 @@ import Server from "./server.js";
 class EntityBuilder {
     findTag(searchTag, target) {
         const allTags = this.getTags(target);
-        if(!allTags[0]) return false;
+        if(!allTags) return false;
         for(const tag of allTags) if(tag.replace(/§./g, '').match(new RegExp(`^${searchTag.replace(/§./g, '')}$`))) return true;
         return false;
     };
     getTags(target) {
         const data = Server.runCommand(`tag @e${target ? `[${target.replace(/\]|\[/g, '')}]` : ''} list`);
-        if(data.error) return [];
-        return data.result.statusMessage.match(/(?<=: ).*$/)[0].split('§r, §a');
+        if(data.error) return;
+        let tags = data.statusMessage.match(/(?<=: ).*$/);
+        if(tags) return tags[0].split('§r, §a');
     };
     getScore(objective, target, { minimum, maximum } = {}) {
         const data = Server.runCommand(`scoreboard players test @e${target ? `[${target.replace(/\]|\[/g, '')}]` : ''} ${objective} ${minimum ? minimum : '*'} ${maximum ? maximum : '*'}`);
         if(data.error) return;
-        return parseInt(data.result.statusMessage.match(/-?\d+/)[0]);
+        return parseInt(data.statusMessage.match(/-?\d+/)[0]);
     };
 };
 
 /**
  * @type {import('../typings/classes/Enitity').EntityBuilder}
  */
 const Entity = new EntityBuilder();
-export default Entity;
+export default Entity;