Skip to content
This repository was archived by the owner on Oct 1, 2023. It is now read-only.

Commit fac18ac

Browse files
committed
fix cmd system
1 parent 036b5c5 commit fac18ac

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

server/cmd/cmd.lua

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,11 @@ local cmds = {}
22
local currentPlayer
33

44
RegisterNetEvent('rcore:changePlayer')
5-
AddEventHandler('rcore:changePlayer',function(xPlayer)
6-
currentPlayer = xPlayer
5+
AddEventHandler('rcore:changePlayer',function(source)
6+
currentPlayer = ESX.GetPlayerFromId(source)
77
end)
88

99
function isAtGroup(name)
10-
if currentPlayer == nil then
11-
if ESX.IsPlayerLoaded() then
12-
currentPlayer = ESX.GetPlayerData()
13-
end
14-
end
1510
local group = currentPlayer.getGroup()
1611
if group == name then
1712
return true
@@ -20,11 +15,6 @@ function isAtGroup(name)
2015
end
2116

2217
function isAtJob(name)
23-
if currentPlayer == nil then
24-
if ESX.IsPlayerLoaded() then
25-
currentPlayer = ESX.GetPlayerData()
26-
end
27-
end
2818
local job = currentPlayer.getJob()
2919
if job == nil then
3020
return false
@@ -33,6 +23,7 @@ function isAtJob(name)
3323
if job.name == name then
3424
return true
3525
end
26+
3627
return false
3728
end
3829

0 commit comments

Comments
 (0)