diff options
author | Daniel Matthies <mageluingil@gmail.com> | 2021-04-21 18:08:04 -0600 |
---|---|---|
committer | Daniel Matthies <mageluingil@gmail.com> | 2021-04-21 18:08:04 -0600 |
commit | 1c4e693af60c74215dbc3fbf5cbd5eeeebe04ecb (patch) | |
tree | 6765b90dce1adaaf4fd98b0c8463f6a384f9732a /src/MinecraftHandler.ts | |
parent | update packages (diff) | |
download | shulker-1c4e693af60c74215dbc3fbf5cbd5eeeebe04ecb.tar.gz shulker-1c4e693af60c74215dbc3fbf5cbd5eeeebe04ecb.zip |
Fixing death message false positives
Diffstat (limited to 'src/MinecraftHandler.ts')
-rw-r--r-- | src/MinecraftHandler.ts | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/MinecraftHandler.ts b/src/MinecraftHandler.ts index 452784a..faf1828 100644 --- a/src/MinecraftHandler.ts +++ b/src/MinecraftHandler.ts @@ -113,15 +113,14 @@ class MinecraftHandler { return { username: serverUsername, message: `**${username}** ${rest}` } } } else if (this.config.SHOW_PLAYER_DEATH) { - for (let word of this.config.DEATH_KEY_WORDS){ - if (data.includes(word)){ - if (this.config.DEBUG) { - console.log( - `[DEBUG] A player died. Matched key word "${word}"` - ) - } - return { username: serverUsername, message: logLine } + const death_msg_re = new RegExp(this.config.REGEX_DEATH_MESSAGE) + const death_msg_match = logLine.match(death_msg_re) + + if (death_msg_match) { + if (this.config.DEBUG) { + console.log(`[DEBUG] A player died. Matched on "${death_msg_match[1]}"`) } + return { username: serverUsername, message: logLine } } } |