diff --git a/init.lua b/init.lua index 7f25d1e..c84bbf1 100644 --- a/init.lua +++ b/init.lua @@ -8,7 +8,8 @@ Config = { discordActionLink = GetConvar("discordActionLink", "https://discord.gg/Z9Mxu72zZ6"), discordActionText2 = GetConvar("core:discordActionText2", "STORE"), discordActionLink2 = GetConvar("core:discordActionLink2", "https://andyyy.tebex.io/category/fivem-scripts"), - groups = json.decode(GetConvar("core:groups")) or {} + groups = json.decode(GetConvar("core:groups")) or {}, + characterIdentifier = GetConvar("core:characterIdentifier", "license") } local nd_core = exports["ND_Core"] diff --git a/server/player.lua b/server/player.lua index 5f21df5..c459f9e 100644 --- a/server/player.lua +++ b/server/player.lua @@ -1,7 +1,7 @@ local function createCharacterTable(info) local self = { source = info.source, - license = info.license, + identifier = info.identifier, name = info.name, firstname = info.firstname, lastname = info.lastname, @@ -209,12 +209,12 @@ end ---@param info table ---@return table function NDCore.newCharacter(src, info) - local license = GetPlayerIdentifierByType(src, "license") - if not license then return end + local identifier = GetPlayerIdentifierByType(src, Config.characterIdentifier) + if not identifier then return end local charInfo = createCharacterTable({ source = src, - license = license, + identifier = identifier, name = GetPlayerName(src) or "", firstname = info.firstname or "", lastname = info.lastname or "", @@ -227,8 +227,8 @@ function NDCore.newCharacter(src, info) inventory = info.inventory or {}, }) - charInfo.id = MySQL.insert.await("INSERT INTO nd_characters (license, name, firstname, lastname, dob, gender, cash, bank, metadata) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", { - license, + charInfo.id = MySQL.insert.await("INSERT INTO nd_characters (identifier, name, firstname, lastname, dob, gender, cash, bank, metadata) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", { + identifier, charInfo.name, charInfo.firstname, charInfo.lastname, @@ -251,7 +251,7 @@ function NDCore.fetchCharacter(id) local info = result[1] return createCharacterTable({ id = id, - license = info.license, + identifier = info.identifier, name = info.name, firstname = info.firstname, lastname = info.lastname, @@ -269,14 +269,14 @@ end ---@return table function NDCore.getPlayerCharacters(src) local characters = {} - local result = MySQL.query.await("SELECT * FROM nd_characters WHERE license = ?", {GetPlayerIdentifierByType(src, "license")}) + local result = MySQL.query.await("SELECT * FROM nd_characters WHERE identifier = ?", {GetPlayerIdentifierByType(src, Config.characterIdentifier)}) local amount = #result for i=1, amount do local info = result[i] characters[info.charid] = createCharacterTable({ id = info.charid, - license = info.license, + identifier = info.identifier, name = info.name, firstname = info.firstname, lastname = info.lastname,