From 3b4d6c21e30681b719649faee48c9f32debe52ed Mon Sep 17 00:00:00 2001 From: Braeden Sowinski Date: Sat, 3 Jun 2023 22:45:43 -0700 Subject: [PATCH] debug killfeed handler --- package.json | 2 +- util/KillfeedHandler.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 7dc29b4..98f8256 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dayz-armbands", - "version": "6.7.10", + "version": "6.7.12", "description": "A General Purpose Discord Bot for DayZ Servers.", "main": "index.js", "nodemonConfig": { diff --git a/util/KillfeedHandler.js b/util/KillfeedHandler.js index f80a77d..e60e37d 100644 --- a/util/KillfeedHandler.js +++ b/util/KillfeedHandler.js @@ -9,12 +9,13 @@ module.exports = { let guild = await client.GetGuild(guildId); const channel = client.channels.cache.get(guild.killfeedChannel); - let template = /(.*) \| Player \"(.*)\" \(DEAD\) \(id=(.*) pos=<(.*)>\)\[HP\: (.*)\] hit by Player \"(.*)\" \(id=(.*) pos=<(.*)>\) into (.*) for (.*) damage \((.*)\) with (.*) from (.*) meters /g; + let template = /(.*) \| Player \"(.*)\" \(id=(.*) pos=<(.*)>\)\[HP\: (.*)\] hit by Player \"(.*)\" \(id=(.*) pos=<(.*)>\) into (.*) for (.*) damage \((.*)\) with (.*) from (.*) meters /g; + let templateDEAD = /(.*) \| Player \"(.*)\" \(DEAD\) \(id=(.*) pos=<(.*)>\)\[HP\: (.*)\] hit by Player \"(.*)\" \(id=(.*) pos=<(.*)>\) into (.*) for (.*) damage \((.*)\) with (.*) from (.*) meters /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)][0]; + let data = killedByPlayer && line.includes('(DEAD)') ? [...line.matchAll(templateDEAD)][0] : killedByPlayer ? [...line.matchAll(template)][0] : [...line.matchAll(explosionTemplate)][0]; if (!data) return stats; // Create base data