Skip to content

Commit 12c0c9a

Browse files
committed
refactor(esx_identity): use static player methods
1 parent 5382f50 commit 12c0c9a

File tree

1 file changed

+19
-15
lines changed

1 file changed

+19
-15
lines changed

[core]/esx_identity/server/main.lua

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ local function deleteIdentityFromDatabase(xPlayer)
1212
end
1313
end
1414

15-
---@param xPlayer StaticPlayer
15+
---@param xPlayer StaticPlayer|xPlayer
1616
---@param data {firstName:string?, lastName:string?, dateOfBirth:string?, height:number?, sex:"m"|"f"?}
1717
function SetPlayerData(xPlayer, data)
1818
local name = ("%s %s"):format(data.firstName, data.lastName)
@@ -23,7 +23,7 @@ function SetPlayerData(xPlayer, data)
2323
xPlayer.set("sex", data.sex)
2424
xPlayer.set("height", data.height)
2525

26-
local state = Player(xPlayer.src).state
26+
local state = Player(xPlayer.getSource()).state
2727
state:set("name", name, true)
2828
state:set("firstName", data.firstName, true)
2929
state:set("lastName", data.lastName, true)
@@ -127,41 +127,45 @@ local function formatName(name)
127127
return convertFirstLetterToUpper(loweredName)
128128
end
129129

130+
---@param xPlayer StaticPlayer
130131
local function setIdentity(xPlayer)
131-
if not alreadyRegistered[xPlayer.identifier] then
132+
local playerIdentifier = xPlayer.getIdentifier()
133+
if not alreadyRegistered[playerIdentifier] then
132134
return
133135
end
134-
local currentIdentity = playerIdentity[xPlayer.identifier]
136+
local currentIdentity = playerIdentity[playerIdentifier]
135137
SetPlayerData(xPlayer, currentIdentity)
136138

137-
TriggerClientEvent("esx_identity:setPlayerData", xPlayer.source, currentIdentity)
139+
TriggerClientEvent("esx_identity:setPlayerData", xPlayer.src, currentIdentity)
138140
if currentIdentity.saveToDatabase then
139-
saveIdentityToDatabase(xPlayer.identifier, currentIdentity)
141+
saveIdentityToDatabase(playerIdentifier, currentIdentity)
140142
end
141143

142-
playerIdentity[xPlayer.identifier] = nil
144+
playerIdentity[playerIdentifier] = nil
143145
end
144146

147+
---@param xPlayer StaticPlayer
145148
local function checkIdentity(xPlayer)
146-
MySQL.single("SELECT firstname, lastname, dateofbirth, sex, height FROM users WHERE identifier = ?", { xPlayer.identifier }, function(result)
149+
local playerIdentifier = xPlayer.getIdentifier()
150+
MySQL.single("SELECT firstname, lastname, dateofbirth, sex, height FROM users WHERE identifier = ?", { playerIdentifier }, function(result)
147151
if not result then
148-
return TriggerClientEvent("esx_identity:showRegisterIdentity", xPlayer.source)
152+
return TriggerClientEvent("esx_identity:showRegisterIdentity", xPlayer.src)
149153
end
150154
if not result.firstname then
151-
playerIdentity[xPlayer.identifier] = nil
152-
alreadyRegistered[xPlayer.identifier] = false
153-
return TriggerClientEvent("esx_identity:showRegisterIdentity", xPlayer.source)
155+
playerIdentity[playerIdentifier] = nil
156+
alreadyRegistered[playerIdentifier] = false
157+
return TriggerClientEvent("esx_identity:showRegisterIdentity", xPlayer.src)
154158
end
155159

156-
playerIdentity[xPlayer.identifier] = {
160+
playerIdentity[playerIdentifier] = {
157161
firstName = result.firstname,
158162
lastName = result.lastname,
159163
dateOfBirth = result.dateofbirth,
160164
sex = result.sex,
161165
height = result.height,
162166
}
163167

164-
alreadyRegistered[xPlayer.identifier] = true
168+
alreadyRegistered[playerIdentifier] = true
165169
setIdentity(xPlayer)
166170
end)
167171
end
@@ -216,7 +220,7 @@ if not multichar then
216220
Wait(0)
217221
end
218222

219-
local xPlayers = ESX.GetExtendedPlayers()
223+
local xPlayers = ESX.ExtendedPlayers() --[=[@as StaticPlayer[]]=]
220224

221225
for i = 1, #xPlayers do
222226
if xPlayers[i] then

0 commit comments

Comments
 (0)