From e31a5ba1699db6f3a844ac836ce35a38ce6304f7 Mon Sep 17 00:00:00 2001
From: Braeden Sowinski <sowinskibraeden@gmail.com>
Date: Sat, 13 May 2023 16:58:50 -0700
Subject: [PATCH] debug explosive death tracker

---
 package.json               | 2 +-
 structures/DayzArmbands.js | 2 +-
 util/KillfeedHandler.js    | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 3953c1c..2cd5d30 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dayz-armbands",
-  "version": "6.7.2",
+  "version": "6.7.3",
   "description": "A General Purpose Discord Bot for DayZ Servers.",
   "main": "index.js",
   "nodemonConfig": {
diff --git a/structures/DayzArmbands.js b/structures/DayzArmbands.js
index 9b72954..e953d86 100644
--- a/structures/DayzArmbands.js
+++ b/structures/DayzArmbands.js
@@ -141,7 +141,7 @@ class DayzArmbands extends Client {
     for (let i = logIndex + 1; i < lines.length; i++) {
       if (lines[i].includes("Unknown")) continue;
       if (lines[i].includes('connected') || lines[i].includes('pos=<') || lines[1].includes('hit by Player')) s = await HandlePlayerLogs(this, guildId, s, lines[i]);
-      if (lines[i].includes('hit by explosion') && lines[i].includes('(DEAD)')) s = await HandleKillfeed(this, guildId, s, lines[i]);
+      if (lines[i].includes('killed by  with')) s = await HandleKillfeed(this, guildId, s, lines[i]);
       if (!(i + 1 >= lines.length) && lines[i + 1].includes('killed by Player')) s = await HandleKillfeed(this, guildId, s, lines[i]);
     }
 
diff --git a/util/KillfeedHandler.js b/util/KillfeedHandler.js
index e0fc13a..4d76211 100644
--- a/util/KillfeedHandler.js
+++ b/util/KillfeedHandler.js
@@ -10,11 +10,11 @@ module.exports = {
     const channel = client.channels.cache.get(guild.killfeedChannel);
 
     let template           = /(.*) \| Player \"(.*)\" \(DEAD\) \(id=(.*) pos=<(.*)>\)\[HP\: 0\] hit by Player \"(.*)\" \(id=(.*) pos=<(.*)>\) into (.*) for (.*) damage \((.*)\) with (.*) from (.*) meters /g;
-    let explosionTemplate  = /(.*) \| Player \"(.*)\" \(DEAD\) \(id=(.*) pos=<(.*)>\)\[HP\: 0] hit by explosion \((.*)\)/g;
+    let explosionTemplate  = /(.*) \| Player \"(.*)\" \(DEAD\) \(id=(.*) pos=<(.*)>\) killed by  with (.*)/g;
     
     let killedByPlayer = line.includes('hit by Player') ? true : false;
 
-    let data = killedByPlayer ? [...line.matchAll(template)][0] : [...line.matchAll(explosionTemplate)];
+    let data = killedByPlayer ? [...line.matchAll(template)][0] : [...line.matchAll(explosionTemplate)][0];
     if (!data) return stats;
     
     // Create base data
@@ -35,7 +35,7 @@ module.exports = {
       info.bullet    = data[10];
       info.weapon    = data[11];
       info.distance  = data[12];
-    } else info.explosive = data[5];
+    } else info.causeOfDeath = data[5];
 
     let newDt = await client.getDateEST(info.time);
     let unixTime = Math.floor(newDt.getTime()/1000);
@@ -43,7 +43,7 @@ module.exports = {
     if (!killedByPlayer) {
       const killEvent = new EmbedBuilder()
         .setColor(client.config.Colors.Default)
-        .setDescription(`**Death Event** - <t:${unixTime}>\n**${info.victim}** blew up from a **${info.explosive}.**>`);
+        .setDescription(`**Death Event** - <t:${unixTime}>\n**${info.victim}** killed by a **${info.causeOfDeath}.**>`);
 
       if (client.exists(channel)) await channel.send({ embeds: [killEvent] });
       return stats;