Merge pull request #49 from Thomas-Smyth/beta

SquadJS v1.3.3 Release
Team-Silver-Sphere · Sep 2, 2020 · 8b5e76a · 8b5e76a
2 parents fd7a2fd + 6c4da74
commit 8b5e76a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "SquadJS",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "repository": "https://github.com/Thomas-Smyth/SquadJS.git",
   "author": "Thomas Smyth <https://github.com/Thomas-Smyth>",
   "license": "BSL-1.0",

diff --git a/plugins/auto-tk-warn/index.js b/plugins/auto-tk-warn/index.js
@@ -16,11 +16,11 @@ export default {
     }
   },
 
-  init: async (server, connectors, options) => {
+  init: async (server, options) => {
     server.on(LOG_PARSER_TEAMKILL, (info) => {
       // ignore suicides
       if (info.attacker.steamID === info.victim.steamID) return;
-      server.rcon.execute(`AdminWarn "${info.attacker.steamID}" ${options.message}`);
+      server.rcon.warn(info.attacker.steamID, options.message);
     });
   }
 };
diff --git a/plugins/discord-debug/index.js b/plugins/discord-debug/index.js
@@ -30,8 +30,7 @@ export default {
 
     for (const event of options.events) {
       server.on(event, (info) => {
-        info.event = event;
-        channel.send(`\`\`\`${JSON.stringify(info, null, 2)}\`\`\``);
+        channel.send(`\`\`\`${JSON.stringify({ ...info, event }, null, 2)}\`\`\``);
       });
     }
   }