FumeNodes/ox_lib
1
0
Fork 0
mirror of https://github.com/CommunityOx/ox_lib.git synced 2026-08-17 06:56:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor(getCore/client): clean up hasGroup method and return values

Browse Source
This commit is contained in:
Linden
2022-05-12 07:44:29 +10:00
parent 4575b5e02a
commit 139ae0701b
3 changed files with 50 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
imports/getCore/es_extended/client.lua
View File

@@ -11,28 +11,30 @@ return function(resource)
ESX.PlayerData.job = job ESX.PlayerData.job = job
end) end)
lib.addPlayerMethod('hasGroup', function(self, filter) lib.addPlayerMethod('hasGroup', function(_, filter)
local data = ESX.PlayerData
local type = type(filter) local type = type(filter)
if type == 'string' then if type == 'string' then
return ESX.PlayerData.job.name == filter if data.job.name == filter then
end return data.job.name, data.job.grade
end
else
local tabletype = table.type(filter)
local tabletype = table.type(filter) if tabletype == 'hash' then
local grade = filter[data.job.name]
if tabletype == 'hash' then if grade and grade <= data.job.grade then
local grade = filter[ESX.PlayerData.job.name] return data.job.name, data.job.grade
return grade and grade <= ESX.PlayerData.job.grade end
end elseif tabletype == 'array' then
for i = 1, #filter do
if tabletype == 'array' then if data.job.name == filter[i] then
for i = 1, #filter do return data.job.name, data.job.grade
if ESX.PlayerData.job.name == filter[i] then end
return true
end end
end end
return false
end end
end) end)

59
imports/getCore/qb-core/client.lua
View File

@@ -16,41 +16,44 @@ return function(resource)
PlayerData.gang = gang PlayerData.gang = gang
end) end)
lib.addPlayerMethod('hasGroup', function(self, filter) local groups = { 'job', 'gang' }
lib.addPlayerMethod('hasGroup', function(_, filter)
local type = type(filter) local type = type(filter)
if type == 'string' then if type == 'string' then
return PlayerData.job.name == filter or PlayerData.gang.name == filter for i = 1, #groups do
end local data = PlayerData[groups[i]]
local tabletype = table.type(filter) if data.name == filter then
return data.name, data.grade.level
if tabletype == 'hash' then
local jobGrade = filter[PlayerData.job.name]
if jobGrade then
return jobGrade <= PlayerData.job.grade
end
local gangGrade = filter[PlayerData.gang.name]
if gangGrade then
return gangGrade <= PlayerData.gang.grade
end
return false
end
if tabletype == 'array' then
for i = 1, #filter do
local group = filter[i]
if PlayerData.job.name == group or PlayerData.gang.name == group then
return true
end end
end end
else
local tabletype = table.type(filter)
return false if tabletype == 'hash' then
for i = 1, #groups do
local data = PlayerData[groups[i]]
local grade = filter[data.name]
if grade and grade <= data.grade.level then
return data.name, data.grade.level
end
end
elseif tabletype == 'array' then
for i = 1, #filter do
local group = filter[i]
for j = 1, #groups do
local data = PlayerData[groups[j]]
if data.name == group then
return data.group.name, data.grade.level
end
end
end
end
end end
end) end)

2
init.lua
View File

@@ -158,6 +158,8 @@ local cache = setmetatable({}, {
self.serverId = GetPlayerServerId(self.playerId) self.serverId = GetPlayerServerId(self.playerId)
end end
self.resource = GetCurrentResourceName()
if ox.groups then if ox.groups then
self.groups = setmetatable({}, { self.groups = setmetatable({}, {
__index = function(groups, index) __index = function(groups, index)