From ab4dc91eb84887dce6fb7a017331c709756f4e59 Mon Sep 17 00:00:00 2001 From: Rafael Antunes <147253092+Fellow1990@users.noreply.github.com> Date: Thu, 14 Aug 2025 18:58:42 +0100 Subject: [PATCH 1/3] use static player methods ESX Identity --- [core]/esx_identity/server/main.lua | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/[core]/esx_identity/server/main.lua b/[core]/esx_identity/server/main.lua index 140a009e..e6c84504 100644 --- a/[core]/esx_identity/server/main.lua +++ b/[core]/esx_identity/server/main.lua @@ -245,7 +245,7 @@ end end ESX.RegisterServerCallback("esx_identity:registerIdentity", function(source, cb, data) - local xPlayer = ESX.GetPlayerFromId(source) + local xPlayer = ESX.Player(source) if not checkNameFormat(data.firstname) then TriggerClientEvent("esx:showNotification", source, TranslateCap("invalid_firstname_format"), "error") @@ -269,12 +269,12 @@ end end if xPlayer then - if alreadyRegistered[xPlayer.identifier] then + if alreadyRegistered[xPlayer.getIdentifier()] then xPlayer.showNotification(TranslateCap("already_registered"), "error") return cb(false) end - playerIdentity[xPlayer.identifier] = { + playerIdentity[xPlayer.getIdentifier()] = { firstName = formatName(data.firstname), lastName = formatName(data.lastname), dateOfBirth = formatDate(data.dateofbirth), @@ -282,14 +282,14 @@ end height = data.height, } - local currentIdentity = playerIdentity[xPlayer.identifier] + local currentIdentity = playerIdentity[xPlayer.getIdentifier()] SetPlayerData(xPlayer, currentIdentity) - TriggerClientEvent("esx_identity:setPlayerData", xPlayer.source, currentIdentity) - saveIdentityToDatabase(xPlayer.identifier, currentIdentity) - alreadyRegistered[xPlayer.identifier] = true - playerIdentity[xPlayer.identifier] = nil + TriggerClientEvent("esx_identity:setPlayerData", xPlayer.src, currentIdentity) + saveIdentityToDatabase(xPlayer.getIdentifier(), currentIdentity) + alreadyRegistered[xPlayer.getIdentifier()] = true + playerIdentity[xPlayer.getIdentifier()] = nil return cb(true) end @@ -334,13 +334,13 @@ if Config.EnableCommands then Wait(1500) deleteIdentity(xPlayer) xPlayer.showNotification(TranslateCap("deleted_character")) - playerIdentity[xPlayer.identifier] = nil - alreadyRegistered[xPlayer.identifier] = false + playerIdentity[xPlayer.getIdentifier()] = nil + alreadyRegistered[xPlayer.getIdentifier()] = false else deleteIdentity(xPlayer) xPlayer.showNotification(TranslateCap("deleted_character")) - playerIdentity[xPlayer.identifier] = nil - alreadyRegistered[xPlayer.identifier] = false + playerIdentity[xPlayer.getIdentifier()] = nil + alreadyRegistered[xPlayer.getIdentifier()] = false TriggerClientEvent("esx_identity:showRegisterIdentity", xPlayer.source) end else From 3a37ca3d0c65a39d32499817c328d7d2375e2999 Mon Sep 17 00:00:00 2001 From: Rafael Antunes <147253092+Fellow1990@users.noreply.github.com> Date: Thu, 14 Aug 2025 19:00:13 +0100 Subject: [PATCH 2/3] use static player methods ESX Skin --- [core]/esx_skin/server/main.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/[core]/esx_skin/server/main.lua b/[core]/esx_skin/server/main.lua index 60ec63df..ff5e87b2 100644 --- a/[core]/esx_skin/server/main.lua +++ b/[core]/esx_skin/server/main.lua @@ -2,7 +2,7 @@ RegisterNetEvent("esx_skin:save", function(skin) if not skin or type(skin) ~= "table" then return end - local xPlayer = ESX.GetPlayerFromId(source) + local xPlayer = ESX.Player(source) if not ESX.GetConfig().CustomInventory then local defaultMaxWeight = ESX.GetConfig().MaxWeight @@ -17,12 +17,12 @@ RegisterNetEvent("esx_skin:save", function(skin) MySQL.update("UPDATE users SET skin = @skin WHERE identifier = @identifier", { ["@skin"] = json.encode(skin), - ["@identifier"] = xPlayer.identifier, + ["@identifier"] = xPlayer.getIdentifier(), }) end) RegisterNetEvent("esx_skin:setWeight", function(skin) - local xPlayer = ESX.GetPlayerFromId(source) + local xPlayer = ESX.Player(source) if not ESX.GetConfig().CustomInventory then local defaultMaxWeight = ESX.GetConfig().MaxWeight @@ -37,16 +37,16 @@ RegisterNetEvent("esx_skin:setWeight", function(skin) end) ESX.RegisterServerCallback("esx_skin:getPlayerSkin", function(source, cb) - local xPlayer = ESX.GetPlayerFromId(source) + local xPlayer = ESX.Player(source) MySQL.query("SELECT skin FROM users WHERE identifier = @identifier", { - ["@identifier"] = xPlayer.identifier, + ["@identifier"] = xPlayer.getIdentifier(), }, function(users) local user, skin = users[1], nil local jobSkin = { - skin_male = xPlayer.job.skin_male, - skin_female = xPlayer.job.skin_female, + skin_male = xPlayer.getJob().skin_male, + skin_female = xPlayer.getJob().skin_female, } if user.skin then From 83972de4a204d29c2221802155dd02d09e32bd39 Mon Sep 17 00:00:00 2001 From: Rafael Antunes <147253092+Fellow1990@users.noreply.github.com> Date: Fri, 15 Aug 2025 18:41:15 +0100 Subject: [PATCH 3/3] Call the same function fix ESX Identity --- [core]/esx_identity/server/main.lua | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/[core]/esx_identity/server/main.lua b/[core]/esx_identity/server/main.lua index e6c84504..c7c8de76 100644 --- a/[core]/esx_identity/server/main.lua +++ b/[core]/esx_identity/server/main.lua @@ -269,12 +269,13 @@ end end if xPlayer then - if alreadyRegistered[xPlayer.getIdentifier()] then + local identifier = xPlayer.getIdentifier() + if alreadyRegistered[identifier] then xPlayer.showNotification(TranslateCap("already_registered"), "error") return cb(false) end - playerIdentity[xPlayer.getIdentifier()] = { + playerIdentity[identifier] = { firstName = formatName(data.firstname), lastName = formatName(data.lastname), dateOfBirth = formatDate(data.dateofbirth), @@ -282,14 +283,14 @@ end height = data.height, } - local currentIdentity = playerIdentity[xPlayer.getIdentifier()] + local currentIdentity = playerIdentity[identifier] SetPlayerData(xPlayer, currentIdentity) TriggerClientEvent("esx_identity:setPlayerData", xPlayer.src, currentIdentity) - saveIdentityToDatabase(xPlayer.getIdentifier(), currentIdentity) - alreadyRegistered[xPlayer.getIdentifier()] = true - playerIdentity[xPlayer.getIdentifier()] = nil + saveIdentityToDatabase(identifier, currentIdentity) + alreadyRegistered[identifier] = true + playerIdentity[identifier] = nil return cb(true) end @@ -329,18 +330,19 @@ if Config.EnableCommands then ESX.RegisterCommand("chardel", "user", function(xPlayer) if xPlayer and xPlayer.getName() then + local identifier = xPlayer.getIdentifier() if Config.UseDeferrals then xPlayer.kick(TranslateCap("deleted_identity")) Wait(1500) deleteIdentity(xPlayer) xPlayer.showNotification(TranslateCap("deleted_character")) - playerIdentity[xPlayer.getIdentifier()] = nil - alreadyRegistered[xPlayer.getIdentifier()] = false + playerIdentity[identifier] = nil + alreadyRegistered[identifier] = false else deleteIdentity(xPlayer) xPlayer.showNotification(TranslateCap("deleted_character")) - playerIdentity[xPlayer.getIdentifier()] = nil - alreadyRegistered[xPlayer.getIdentifier()] = false + playerIdentity[identifier] = nil + alreadyRegistered[identifier] = false TriggerClientEvent("esx_identity:showRegisterIdentity", xPlayer.source) end else