diff --git a/init.lua b/init.lua index bde914e..6a1c9cc 100644 --- a/init.lua +++ b/init.lua @@ -48,7 +48,7 @@ end) -- The following assignments expose core utilities globally, -- making them accessible in all subsequently loaded modules. -_ENV.cLib = cLib ~= nil and cLib or exports.community_bridge:cLib() ---@type table +_ENV.cLib = cLib ~= nil and cLib or export.community_lib.cLib() ---@type table _ENV.Require = Require ---@type fun(module: string): any exports("RegisterModule", Bridge.RegisterModule) @@ -129,3 +129,21 @@ Bridge.RegisterModule("Target", Target) Bridge.RegisterModule("Menu", Menu) Bridge.RegisterModule("Dialogue", Dialogue) Bridge.RegisterModule("Accessibility", Accessibility) -- new + +-- Fill the bridge tables with player data. +function FillBridgeTables() + PlayerLoaded = true + PlayerIdentifier = Framework.GetPlayerIdentifier() + PlayerJobName, PlayerJobLabel, PlayerJobGradeName, PlayerJobGradeLevel = Framework.GetPlayerJob() +end + +-- Clean the bridge tables. +function ClearClientSideVariables() + PlayerLoaded = false + PlayerIdentifier = nil + PlayerJobName = nil + PlayerJobLabel = nil + PlayerJobGradeName = nil + PlayerJobGradeLevel = nil + StoredOldClothing = {} +end diff --git a/modules/framework/es_extended/client.lua b/modules/framework/es_extended/client.lua index 9b4f0a2..b0e3fca 100644 --- a/modules/framework/es_extended/client.lua +++ b/modules/framework/es_extended/client.lua @@ -119,15 +119,21 @@ end RegisterNetEvent('esx:playerLoaded', function(xPlayer) Wait(1500) - TriggerEvent('community_bridge:Client:OnPlayerLoaded') + FillBridgeTables() + TriggerEvent('community_bridge:Client:OnPlayerLoaded') end) RegisterNetEvent('esx:onPlayerLogout', function() - TriggerEvent('community_bridge:Client:OnPlayerUnload') + ClearClientSideVariables() + TriggerEvent('community_bridge:Client:OnPlayerUnload') end) RegisterNetEvent('esx:setJob', function(data) - TriggerEvent('community_bridge:Client:OnPlayerJobUpdate', data.name, data.label, data.grade_label, data.grade) + PlayerJobName = data.name + PlayerJobLabel = data.label + PlayerJobGradeName = data.grade_label + PlayerJobGradeLevel = data.grade + TriggerEvent('community_bridge:Client:OnPlayerJobUpdate',PlayerJobName, PlayerJobLabel, PlayerJobGradeName, PlayerJobGradeLevel) end) return Framework \ No newline at end of file diff --git a/modules/framework/qb-core/client.lua b/modules/framework/qb-core/client.lua index 180adf1..71639aa 100644 --- a/modules/framework/qb-core/client.lua +++ b/modules/framework/qb-core/client.lua @@ -148,15 +148,21 @@ Framework.Shared = QBCore.Shared RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function() Wait(1500) + FillBridgeTables() TriggerEvent('community_bridge:Client:OnPlayerLoaded') end) RegisterNetEvent('QBCore:Client:OnPlayerUnload', function() - TriggerEvent('community_bridge:Client:OnPlayerUnload') + ClearClientSideVariables() + TriggerEvent('community_bridge:Client:OnPlayerUnload') end) RegisterNetEvent('QBCore:Client:OnJobUpdate', function(data) - TriggerEvent('community_bridge:Client:OnPlayerJobUpdate', data.name, data.label, data.grade.name, data.grade.level) + PlayerJobName = data.name + PlayerJobLabel = data.label + PlayerJobGradeName = data.grade.name + PlayerJobGradeLevel = data.grade.level + TriggerEvent('community_bridge:Client:OnPlayerJobUpdate', PlayerJobName, PlayerJobLabel, PlayerJobGradeName, PlayerJobGradeLevel) end) RegisterNetEvent('QBCore:Client:OnGangUpdate', function(data) diff --git a/modules/framework/qbx_core/client.lua b/modules/framework/qbx_core/client.lua index 20e6805..2fee358 100644 --- a/modules/framework/qbx_core/client.lua +++ b/modules/framework/qbx_core/client.lua @@ -74,15 +74,21 @@ end RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function() Wait(1500) + FillBridgeTables() TriggerEvent('community_bridge:Client:OnPlayerLoaded') end) RegisterNetEvent('QBCore:Client:OnPlayerUnload', function() - TriggerEvent('community_bridge:Client:OnPlayerUnload') + ClearClientSideVariables() + TriggerEvent('community_bridge:Client:OnPlayerUnload') end) RegisterNetEvent('QBCore:Client:OnJobUpdate', function(data) - TriggerEvent('community_bridge:Client:OnPlayerJobUpdate', data.name, data.label, data.grade.name, data.grade.level) + PlayerJobName = data.name + PlayerJobLabel = data.label + PlayerJobGradeName = data.grade.name + PlayerJobGradeLevel = data.grade.level + TriggerEvent('community_bridge:Client:OnPlayerJobUpdate',PlayerJobName, PlayerJobLabel, PlayerJobGradeName, PlayerJobGradeLevel) end) return Framework \ No newline at end of file