From c26dccc6e92cbce80e615a9aad7ba2b18058818f Mon Sep 17 00:00:00 2001 From: Solareon <769465+solareon@users.noreply.github.com> Date: Fri, 26 Jul 2024 18:48:58 +0200 Subject: [PATCH] Revert "refactor: use lib.triggerClientEvent (#523)" (#524) This reverts commit 061e2dd72a542b383ee02fb8acd83d337593c327. --- bridge/qb/server/functions.lua | 8 ++++---- server/groups.lua | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bridge/qb/server/functions.lua b/bridge/qb/server/functions.lua index e3e8a1161..cb16e03c1 100644 --- a/bridge/qb/server/functions.lua +++ b/bridge/qb/server/functions.lua @@ -145,7 +145,7 @@ local function AddItem(itemName, item) QBX.Shared.Items[itemName] = item - lib.triggerClientEvent('QBCore:Client:OnSharedUpdate', -1, 'Items', itemName, item) + TriggerClientEvent('QBCore:Client:OnSharedUpdate', -1, 'Items', itemName, item) TriggerEvent('QBCore:Server:UpdateObject') return true, 'success' end @@ -164,7 +164,7 @@ local function UpdateItem(itemName, item) return false, 'item_not_exists' end QBX.Shared.Items[itemName] = item - lib.triggerClientEvent('QBCore:Client:OnSharedUpdate', -1, 'Items', itemName, item) + TriggerClientEvent('QBCore:Client:OnSharedUpdate', -1, 'Items', itemName, item) TriggerEvent('QBCore:Server:UpdateObject') return true, 'success' end @@ -199,7 +199,7 @@ local function AddItems(items) end if not shouldContinue then return false, message, errorItem end - lib.triggerClientEvent('QBCore:Client:OnSharedUpdateMultiple', -1, 'Items', items) + TriggerClientEvent('QBCore:Client:OnSharedUpdateMultiple', -1, 'Items', items) TriggerEvent('QBCore:Server:UpdateObject') return true, message, nil end @@ -221,7 +221,7 @@ local function RemoveItem(itemName) QBX.Shared.Items[itemName] = nil - lib.triggerClientEvent('QBCore:Client:OnSharedUpdate', -1, 'Items', itemName, nil) + TriggerClientEvent('QBCore:Client:OnSharedUpdate', -1, 'Items', itemName, nil) TriggerEvent('QBCore:Server:UpdateObject') return true, 'success' end diff --git a/server/groups.lua b/server/groups.lua index 168bbc7ff..0d46cfe51 100644 --- a/server/groups.lua +++ b/server/groups.lua @@ -42,7 +42,7 @@ function CreateJobs(newJobs) for jobName, job in pairs(newJobs) do jobs[jobName] = job TriggerEvent('qbx_core:server:onJobUpdate', jobName, job) - lib.triggerClientEvent('qbx_core:client:onJobUpdate', -1, jobName, job) + TriggerClientEvent('qbx_core:client:onJobUpdate', -1, jobName, job) end end @@ -63,7 +63,7 @@ function RemoveJob(jobName) jobs[jobName] = nil TriggerEvent('qbx_core:server:onJobUpdate', jobName, nil) - lib.triggerClientEvent('qbx_core:client:onJobUpdate', -1, jobName, nil) + TriggerClientEvent('qbx_core:client:onJobUpdate', -1, jobName, nil) return true, 'success' end @@ -75,7 +75,7 @@ function CreateGangs(newGangs) for gangName, gang in pairs(newGangs) do gangs[gangName] = gang TriggerEvent('qbx_core:server:onGangUpdate', gangName, gang) - lib.triggerClientEvent('qbx_core:client:onGangUpdate', -1, gangName, gang) + TriggerClientEvent('qbx_core:client:onGangUpdate', -1, gangName, gang) end end @@ -97,7 +97,7 @@ function RemoveGang(gangName) gangs[gangName] = nil TriggerEvent('qbx_core:server:onGangUpdate', gangName, nil) - lib.triggerClientEvent('qbx_core:client:onGangUpdate', -1, gangName, nil) + TriggerClientEvent('qbx_core:client:onGangUpdate', -1, gangName, nil) return true, 'success' end @@ -151,7 +151,7 @@ local function upsertJobData(name, data) } end TriggerEvent('qbx_core:server:onJobUpdate', name, jobs[name]) - lib.triggerClientEvent('qbx_core:client:onJobUpdate', -1, name, jobs[name]) + TriggerClientEvent('qbx_core:client:onJobUpdate', -1, name, jobs[name]) end exports('UpsertJobData', upsertJobData) @@ -168,7 +168,7 @@ local function upsertGangData(name, data) } end TriggerEvent('qbx_core:server:onGangUpdate', name, gangs[name]) - lib.triggerClientEvent('qbx_core:client:onGangUpdate', -1, name, gangs[name]) + TriggerClientEvent('qbx_core:client:onGangUpdate', -1, name, gangs[name]) end exports('UpsertGangData', upsertGangData) @@ -183,7 +183,7 @@ local function upsertJobGrade(name, grade, data) end jobs[name].grades[grade] = data TriggerEvent('qbx_core:server:onJobUpdate', name, jobs[name]) - lib.triggerClientEvent('qbx_core:client:onJobUpdate', -1, name, jobs[name]) + TriggerClientEvent('qbx_core:client:onJobUpdate', -1, name, jobs[name]) end exports('UpsertJobGrade', upsertJobGrade) @@ -198,7 +198,7 @@ local function upsertGangGrade(name, grade, data) end gangs[name].grades[grade] = data TriggerEvent('qbx_core:server:onGangUpdate', name, gangs[name]) - lib.triggerClientEvent('qbx_core:client:onGangUpdate', -1, name, gangs[name]) + TriggerClientEvent('qbx_core:client:onGangUpdate', -1, name, gangs[name]) end exports('UpsertGangGrade', upsertGangGrade) @@ -212,7 +212,7 @@ local function removeJobGrade(name, grade) end jobs[name].grades[grade] = nil TriggerEvent('qbx_core:server:onJobUpdate', name, jobs[name]) - lib.triggerClientEvent('qbx_core:client:onJobUpdate', -1, name, jobs[name]) + TriggerClientEvent('qbx_core:client:onJobUpdate', -1, name, jobs[name]) end exports('RemoveJobGrade', removeJobGrade) @@ -226,7 +226,7 @@ local function removeGangGrade(name, grade) end gangs[name].grades[grade] = nil TriggerEvent('qbx_core:server:onGangUpdate', name, gangs[name]) - lib.triggerClientEvent('qbx_core:client:onGangUpdate', -1, name, gangs[name]) + TriggerClientEvent('qbx_core:client:onGangUpdate', -1, name, gangs[name]) end exports('RemoveGangGrade', removeGangGrade)