fix: slayer

Author: DuckySoLucky

src/contracts/minecraftCommand.js

@@ -24,18 +24,26 @@ class minecraftCommand {
   /**
    * Sends a message in the Minecraft chat.
    * @param {string} message
-   * @returns
+   * @param {number} maxRetries - Maximum number of retries (default: 5)
    */
-  async send(message) {
+  async send(message, maxRetries = 5) {
     if (!bot?._client?.chat) {
       return;
     }
 
+    const startTime = Date.now();
+    const maxExecutionTime = 10000;
+
     if (message.length > 256) {
       const messages = splitMessage(message, 256);
       for (const msg of messages) {
         await delay(1000);
-        await this.send(msg);
+        await this.send(msg, maxRetries);
+
+        if (Date.now() - startTime > maxExecutionTime) {
+          console.error("Message sending timed out after 10 seconds");
+          return;
+        }
       }
       return;
     }
@@ -70,15 +78,20 @@ class minecraftCommand {
         );
       };
 
-      for (let i = 0; i < 5; i++) {
+      for (let i = 0; i < maxRetries; i++) {
         try {
           await sendMessage();
           return;
         } catch (error) {
+          if (Date.now() - startTime > maxExecutionTime) {
+            console.error("Message sending timed out after 30 seconds");
+            return;
+          }
+
           // @ts-ignore
           if (error.message === "rate-limited") {
-            if (i === 4) {
-              this.send("Command failed to send message after 5 attempts. Please try again later.");
+            if (i === maxRetries - 1) {
+              this.send(`Command failed to send message after ${maxRetries} attempts. Please try again later.`);
               return;
             }
             await delay(2000);

src/minecraft/commands/slayersCommand.js

@@ -32,7 +32,7 @@ class SlayersCommand extends minecraftCommand {
   async onCommand(player, message) {
     try {
       const args = this.getArgs(message);
-      const slayer = ["zombie", "rev", "spider", "tara", "wolf", "sven", "eman", "enderman", "blaze", "demonlord", "vamp", "vampire"];
+      const slayer = ["zombie", "spider", "wolf", "enderman", "blaze", "vampire"];
 
       const slayerType = slayer.includes(args[1]) ? args[1] : null;
       player = args[0] || player;
@@ -47,13 +47,14 @@ class SlayersCommand extends minecraftCommand {
       if (slayerType) {
         this.send(`${username}'s ${titleCase(slayerType)} - ${slayerData[slayerType].level} Levels | Experience: ${formatNumber(slayerData[slayerType].xp)}`);
       } else {
-        const slayer = Object.keys(profile).reduce(
+        const slayer = Object.keys(slayerData).reduce(
           (acc, slayer) => `${acc} | ${titleCase(slayer)}: ${slayerData[slayer].level} (${formatNumber(slayerData[slayer].xp)})`,
           ""
         );
         this.send(`${username}'s Slayer: ${slayer.slice(3)}`);
       }
     } catch (error) {
+      console.log(error);
       this.send(`[ERROR] ${error}`);
     }
   }