From 0dc3d51319271f4aa5ba7fd44a373577b70174b4 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Mon, 12 May 2025 23:13:08 -0400 Subject: [PATCH] psuh for crowley --- init.lua | 20 +------------------- modules/framework/es_extended/client.lua | 12 +++--------- modules/framework/qb-core/client.lua | 10 ++-------- modules/framework/qbx_core/client.lua | 10 ++-------- 4 files changed, 8 insertions(+), 44 deletions(-) diff --git a/init.lua b/init.lua index 6a1c9cc..bde914e 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 export.community_lib.cLib() ---@type table +_ENV.cLib = cLib ~= nil and cLib or exports.community_bridge:cLib() ---@type table _ENV.Require = Require ---@type fun(module: string): any exports("RegisterModule", Bridge.RegisterModule) @@ -129,21 +129,3 @@ 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 b0e3fca..9b4f0a2 100644 --- a/modules/framework/es_extended/client.lua +++ b/modules/framework/es_extended/client.lua @@ -119,21 +119,15 @@ end RegisterNetEvent('esx:playerLoaded', function(xPlayer) Wait(1500) - FillBridgeTables() - TriggerEvent('community_bridge:Client:OnPlayerLoaded') + TriggerEvent('community_bridge:Client:OnPlayerLoaded') end) RegisterNetEvent('esx:onPlayerLogout', function() - ClearClientSideVariables() - TriggerEvent('community_bridge:Client:OnPlayerUnload') + TriggerEvent('community_bridge:Client:OnPlayerUnload') end) RegisterNetEvent('esx:setJob', function(data) - PlayerJobName = data.name - PlayerJobLabel = data.label - PlayerJobGradeName = data.grade_label - PlayerJobGradeLevel = data.grade - TriggerEvent('community_bridge:Client:OnPlayerJobUpdate',PlayerJobName, PlayerJobLabel, PlayerJobGradeName, PlayerJobGradeLevel) + TriggerEvent('community_bridge:Client:OnPlayerJobUpdate', data.name, data.label, data.grade_label, data.grade) 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 71639aa..180adf1 100644 --- a/modules/framework/qb-core/client.lua +++ b/modules/framework/qb-core/client.lua @@ -148,21 +148,15 @@ Framework.Shared = QBCore.Shared RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function() Wait(1500) - FillBridgeTables() TriggerEvent('community_bridge:Client:OnPlayerLoaded') end) RegisterNetEvent('QBCore:Client:OnPlayerUnload', function() - ClearClientSideVariables() - TriggerEvent('community_bridge:Client:OnPlayerUnload') + TriggerEvent('community_bridge:Client:OnPlayerUnload') end) RegisterNetEvent('QBCore:Client:OnJobUpdate', function(data) - PlayerJobName = data.name - PlayerJobLabel = data.label - PlayerJobGradeName = data.grade.name - PlayerJobGradeLevel = data.grade.level - TriggerEvent('community_bridge:Client:OnPlayerJobUpdate', PlayerJobName, PlayerJobLabel, PlayerJobGradeName, PlayerJobGradeLevel) + TriggerEvent('community_bridge:Client:OnPlayerJobUpdate', data.name, data.label, data.grade.name, data.grade.level) end) RegisterNetEvent('QBCore:Client:OnGangUpdate', function(data) diff --git a/modules/framework/qbx_core/client.lua b/modules/framework/qbx_core/client.lua index 2fee358..20e6805 100644 --- a/modules/framework/qbx_core/client.lua +++ b/modules/framework/qbx_core/client.lua @@ -74,21 +74,15 @@ end RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function() Wait(1500) - FillBridgeTables() TriggerEvent('community_bridge:Client:OnPlayerLoaded') end) RegisterNetEvent('QBCore:Client:OnPlayerUnload', function() - ClearClientSideVariables() - TriggerEvent('community_bridge:Client:OnPlayerUnload') + TriggerEvent('community_bridge:Client:OnPlayerUnload') end) RegisterNetEvent('QBCore:Client:OnJobUpdate', function(data) - PlayerJobName = data.name - PlayerJobLabel = data.label - PlayerJobGradeName = data.grade.name - PlayerJobGradeLevel = data.grade.level - TriggerEvent('community_bridge:Client:OnPlayerJobUpdate',PlayerJobName, PlayerJobLabel, PlayerJobGradeName, PlayerJobGradeLevel) + TriggerEvent('community_bridge:Client:OnPlayerJobUpdate', data.name, data.label, data.grade.name, data.grade.level) end) return Framework \ No newline at end of file