From 8f833b1dcbdf143827c7ea03ec02586a4013551b Mon Sep 17 00:00:00 2001 From: Braeden Sowinski Date: Sat, 28 Oct 2023 10:40:25 -0700 Subject: [PATCH 1/2] fix/killfeed bounty payout --- package.json | 2 +- util/KillfeedHandler.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 335a7e6..f862b3d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dayzr-bot", - "version": "11.5.1", + "version": "11.5.2", "description": "A General Purpose Discord Bot for DayZ Nitrado Servers.", "main": "index.js", "nodemonConfig": { diff --git a/util/KillfeedHandler.js b/util/KillfeedHandler.js index aa7c242..f6642c0 100644 --- a/util/KillfeedHandler.js +++ b/util/KillfeedHandler.js @@ -200,13 +200,13 @@ module.exports = { if (!banking) { - banking = await createUser(interaction.member.user.id, GuildDB.serverID, GuildDB.startingBalance, client) + banking = await createUser(interaction.member.user.id, guildId, guild.startingBalance, client) if (!client.exists(banking)) return client.sendInternalError(interaction, err); } banking = banking.user; - if (!client.exists(banking.guilds[GuildDB.serverID])) { - const success = addUser(banking.guilds, GuildDB.serverID, interaction.member.user.id, client, GuildDB.startingBalance); + if (!client.exists(banking.guilds[guildId])) { + const success = addUser(banking.guilds, guildId, interaction.member.user.id, client, guild.startingBalance); if (!success) return client.sendInternalError(interaction, 'Failed to add bank'); } From 3381db70882aa1f82c6d800b3e7abb57b9a016af Mon Sep 17 00:00:00 2001 From: Braeden Sowinski Date: Sat, 28 Oct 2023 10:55:39 -0700 Subject: [PATCH 2/2] fix/PlaceFireplaceInAlarm --- package.json | 2 +- util/AlarmsHandler.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index f862b3d..31895e3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dayzr-bot", - "version": "11.5.2", + "version": "11.5.3", "description": "A General Purpose Discord Bot for DayZ Nitrado Servers.", "main": "index.js", "nodemonConfig": { diff --git a/util/AlarmsHandler.js b/util/AlarmsHandler.js index 06b9667..7a420c9 100644 --- a/util/AlarmsHandler.js +++ b/util/AlarmsHandler.js @@ -207,9 +207,9 @@ module.exports = { let info = { time: data[1], - victim: data[2], - victimID: data[3], - victimPOS: data[4].split(', ').map(v => parseFloat(v)), + player: data[2], + playerID: data[3], + playerPOS: data[4].split(', ').map(v => parseFloat(v)), }; let guild = await client.GetGuild(guildId);