Skip to content

use static player methods #1700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Zykem merged 3 commits into from Aug 16, 2025
Merged

use static player methods #1700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab4dc91
use static player methods
Aug 14, 2025
3a37ca3
use static player methods
Aug 14, 2025
83972de
Call the same function fix
Aug 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions [core]/esx_identity/server/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -269,27 +269,28 @@ end
end

if xPlayer then
if alreadyRegistered[xPlayer.identifier] then
local identifier = xPlayer.getIdentifier()
if alreadyRegistered[identifier] then
xPlayer.showNotification(TranslateCap("already_registered"), "error")
return cb(false)
end

playerIdentity[xPlayer.identifier] = {
playerIdentity[identifier] = {
firstName = formatName(data.firstname),
lastName = formatName(data.lastname),
dateOfBirth = formatDate(data.dateofbirth),
sex = data.sex,
height = data.height,
}

local currentIdentity = playerIdentity[xPlayer.identifier]
local currentIdentity = playerIdentity[identifier]

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(identifier, currentIdentity)
alreadyRegistered[identifier] = true
playerIdentity[identifier] = nil
return cb(true)
end

Expand Down Expand Up @@ -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.identifier] = nil
alreadyRegistered[xPlayer.identifier] = false
playerIdentity[identifier] = nil
alreadyRegistered[identifier] = false
else
deleteIdentity(xPlayer)
xPlayer.showNotification(TranslateCap("deleted_character"))
playerIdentity[xPlayer.identifier] = nil
alreadyRegistered[xPlayer.identifier] = false
playerIdentity[identifier] = nil
alreadyRegistered[identifier] = false
TriggerClientEvent("esx_identity:showRegisterIdentity", xPlayer.source)
end
else
Expand Down
14 changes: 7 additions & 7 deletions [core]/esx_skin/server/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Loading