From 6764ac51a8f007700bbc28a6800584e7839fad54 Mon Sep 17 00:00:00 2001 From: Hakko <67168651+Hakkodevelopment@users.noreply.github.com> Date: Sun, 3 Dec 2023 08:20:56 -0700 Subject: [PATCH 1/4] fix: Discord Convars causing config to break --- server/main.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/main.lua b/server/main.lua index b09ee76..359201f 100644 --- a/server/main.lua +++ b/server/main.lua @@ -15,8 +15,8 @@ Config = { discordActionText2 = GetConvar("core:discordActionText2", "STORE"), discordActionLink2 = GetConvar("core:discordActionLink2", "https://andyyy.tebex.io/category/fivem-scripts"), characterIdentifier = GetConvar("core:characterIdentifier", "license"), - discordGuildId = GetConvar("core:discordGuildId"), - discordBotToken = GetConvar("core:discordBotToken"), + discordGuildId = GetConvar("core:discordGuildId", 'false'), + discordBotToken = GetConvar("core:discordBotToken", 'false'), randomUnlockedVehicleChance = GetConvarInt("core:randomUnlockedVehicleChance", 30), disableVehicleAirControl = GetConvarInt("core:disableVehicleAirControl", 1) == 1, useInventoryForKeys = GetConvarInt("core:useInventoryForKeys", 1) == 1, @@ -68,7 +68,7 @@ AddEventHandler("playerJoining", function(oldId) end) local function checkDiscordIdentifier(identifiers) - if not Config.discordBotToken or not Config.discordGuildId then return end + if Config.discordBotToken == 'false'or Config.discordGuildId == 'false' then return end local discordIdentifier = identifiers["discord"] if not discordIdentifier then return end @@ -77,7 +77,7 @@ local function checkDiscordIdentifier(identifiers) end AddEventHandler("onResourceStart", function(name) - if name ~= resourceName or not Config.discordBotToken or not Config.discordGuildId then return end + if name ~= resourceName or Config.discordBotToken == 'false' or Config.discordGuildId == 'false' then return end for _, playerId in ipairs(GetPlayers()) do local src = tonumber(playerId) local identifiers = getIdentifierList(src) @@ -98,7 +98,7 @@ AddEventHandler("playerConnecting", function(name, setKickReason, deferrals) deferrals.defer() Wait(0) - if mainIdentifier then + if mainIdentifier and Config.discordBotToken == 'false' and Config.discordGuildId == 'false' and not discordInfo then discordInfo = checkDiscordIdentifier(identifiers) if not discordInfo then deferrals.done(("Your discord was not found, join our discord here: %s."):format(Config.discordInvite)) From e064af5a8b5e530040c4a3d2e768c99f656a8dd2 Mon Sep 17 00:00:00 2001 From: Hakko <67168651+Hakkodevelopment@users.noreply.github.com> Date: Sun, 3 Dec 2023 08:38:35 -0700 Subject: [PATCH 2/4] fixed errors, sorry im tired --- server/main.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/main.lua b/server/main.lua index 359201f..ed7db03 100644 --- a/server/main.lua +++ b/server/main.lua @@ -15,8 +15,8 @@ Config = { discordActionText2 = GetConvar("core:discordActionText2", "STORE"), discordActionLink2 = GetConvar("core:discordActionLink2", "https://andyyy.tebex.io/category/fivem-scripts"), characterIdentifier = GetConvar("core:characterIdentifier", "license"), - discordGuildId = GetConvar("core:discordGuildId", 'false'), - discordBotToken = GetConvar("core:discordBotToken", 'false'), + discordGuildId = GetConvar("core:discordGuildId", "false"), + discordBotToken = GetConvar("core:discordBotToken", "false"), randomUnlockedVehicleChance = GetConvarInt("core:randomUnlockedVehicleChance", 30), disableVehicleAirControl = GetConvarInt("core:disableVehicleAirControl", 1) == 1, useInventoryForKeys = GetConvarInt("core:useInventoryForKeys", 1) == 1, @@ -68,7 +68,7 @@ AddEventHandler("playerJoining", function(oldId) end) local function checkDiscordIdentifier(identifiers) - if Config.discordBotToken == 'false'or Config.discordGuildId == 'false' then return end + if Config.discordBotToken == "false"or Config.discordGuildId == "false" then return end local discordIdentifier = identifiers["discord"] if not discordIdentifier then return end @@ -77,7 +77,7 @@ local function checkDiscordIdentifier(identifiers) end AddEventHandler("onResourceStart", function(name) - if name ~= resourceName or Config.discordBotToken == 'false' or Config.discordGuildId == 'false' then return end + if name ~= resourceName or Config.discordBotToken == "false" or Config.discordGuildId == "false" then return end for _, playerId in ipairs(GetPlayers()) do local src = tonumber(playerId) local identifiers = getIdentifierList(src) @@ -98,7 +98,7 @@ AddEventHandler("playerConnecting", function(name, setKickReason, deferrals) deferrals.defer() Wait(0) - if mainIdentifier and Config.discordBotToken == 'false' and Config.discordGuildId == 'false' and not discordInfo then + if mainIdentifier and Config.discordBotToken ~= "false" and Config.discordGuildId ~= "false" and not discordInfo then discordInfo = checkDiscordIdentifier(identifiers) if not discordInfo then deferrals.done(("Your discord was not found, join our discord here: %s."):format(Config.discordInvite)) From 0df4077bfe7395aa8608b464ce57fd453d7d1cdf Mon Sep 17 00:00:00 2001 From: Hakko <67168651+Hakkodevelopment@users.noreply.github.com> Date: Sun, 3 Dec 2023 08:41:46 -0700 Subject: [PATCH 3/4] again.. im tired --- server/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/main.lua b/server/main.lua index ed7db03..67932ed 100644 --- a/server/main.lua +++ b/server/main.lua @@ -68,7 +68,7 @@ AddEventHandler("playerJoining", function(oldId) end) local function checkDiscordIdentifier(identifiers) - if Config.discordBotToken == "false"or Config.discordGuildId == "false" then return end + if Config.discordBotToken == "false" or Config.discordGuildId == "false" then return end local discordIdentifier = identifiers["discord"] if not discordIdentifier then return end From 6f4f94df96363c211d3ab8f0dbe18752c90d249d Mon Sep 17 00:00:00 2001 From: Andy <86536434+Andyyy7666@users.noreply.github.com> Date: Sun, 3 Dec 2023 16:43:51 +0100 Subject: [PATCH 4/4] fix: getting identifiers on resource start --- server/main.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/main.lua b/server/main.lua index 67932ed..fd9fa68 100644 --- a/server/main.lua +++ b/server/main.lua @@ -77,13 +77,13 @@ local function checkDiscordIdentifier(identifiers) end AddEventHandler("onResourceStart", function(name) - if name ~= resourceName or Config.discordBotToken == "false" or Config.discordGuildId == "false" then return end + if name ~= resourceName then return end for _, playerId in ipairs(GetPlayers()) do local src = tonumber(playerId) local identifiers = getIdentifierList(src) PlayersInfo[src] = { identifiers = identifiers, - discord = checkDiscordIdentifier(identifiers) + discord = checkDiscordIdentifier(identifiers) or {} } Wait(65) end