From e71e187a8f0213558a7b8d7d60358109a18b9f9c Mon Sep 17 00:00:00 2001 From: Hakos47 <76844995+hakos47@users.noreply.github.com> Date: Wed, 7 Jun 2023 18:24:32 +0200 Subject: [PATCH 1/6] fix shared update It's a temporary fix while we see how to do it better. but this in principle fixes the error that when a client entered it did not get the table of items etc updated. since shared_scripts does not serve to update information on both sides (client, server) it would fix problems with addItems, addItem, etc. It is not the best solution. but it's a temporary fix --- server/player.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/player.lua b/server/player.lua index 2c454c0..0385b7a 100644 --- a/server/player.lua +++ b/server/player.lua @@ -32,6 +32,11 @@ function QBCore.Player.Login(source, citizenid, newData) return true else QBCore.ShowError(GetCurrentResourceName(), 'ERROR QBCORE.PLAYER.LOGIN - NO SOURCE GIVEN!') + for k,v in pairs(QBCore.Shared) do + if type (v) == 'table' then + TriggerClientEvent('QBCore:Client:OnSharedUpdateMultiple', source, k,v) + end + end return false end end From f7b8e5ecabbd8a8f65af452d36cbf0bc9af9bdb8 Mon Sep 17 00:00:00 2001 From: Hakos47 <76844995+hakos47@users.noreply.github.com> Date: Wed, 7 Jun 2023 18:28:19 +0200 Subject: [PATCH 2/6] Update player.lua fix error --- server/player.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/player.lua b/server/player.lua index 0385b7a..e6c4332 100644 --- a/server/player.lua +++ b/server/player.lua @@ -29,14 +29,14 @@ function QBCore.Player.Login(source, citizenid, newData) else QBCore.Player.CheckPlayerData(source, newData) end - return true - else - QBCore.ShowError(GetCurrentResourceName(), 'ERROR QBCORE.PLAYER.LOGIN - NO SOURCE GIVEN!') - for k,v in pairs(QBCore.Shared) do + for k,v in pairs(QBCore.Shared) do if type (v) == 'table' then TriggerClientEvent('QBCore:Client:OnSharedUpdateMultiple', source, k,v) end end + return true + else + QBCore.ShowError(GetCurrentResourceName(), 'ERROR QBCORE.PLAYER.LOGIN - NO SOURCE GIVEN!') return false end end From 8ea6644270b69276c60dd23ccf3dc9187320d7a7 Mon Sep 17 00:00:00 2001 From: hakos Date: Thu, 28 Sep 2023 12:32:57 +0200 Subject: [PATCH 3/6] update shared at player connection --- client/events.lua | 4 ++++ server/events.lua | 1 + 2 files changed, 5 insertions(+) diff --git a/client/events.lua b/client/events.lua index d529041..8c645f4 100644 --- a/client/events.lua +++ b/client/events.lua @@ -262,3 +262,7 @@ RegisterNetEvent('QBCore:Client:OnSharedUpdateMultiple', function(tableName, val end TriggerEvent('QBCore:Client:UpdateObject') end) + +RegisterNetEvent('QBCore:Client:SharedUpdate', function(table) + QBCore.Shared = table +end) \ No newline at end of file diff --git a/server/events.lua b/server/events.lua index 7d6bd88..e689845 100644 --- a/server/events.lua +++ b/server/events.lua @@ -99,6 +99,7 @@ local function onPlayerConnecting(name, _, deferrals) end -- Add any additional defferals you may need! + TriggerClientEvent('QBCore:Client:SharedUpdate', QBCore.Shared) end AddEventHandler('playerConnecting', onPlayerConnecting) From d797ee14b689b9555e08c17e696af05f1349fc9e Mon Sep 17 00:00:00 2001 From: hakos Date: Thu, 28 Sep 2023 12:38:24 +0200 Subject: [PATCH 4/6] fix update shared and get at player connection --- server/player.lua | 5 ----- 1 file changed, 5 deletions(-) diff --git a/server/player.lua b/server/player.lua index b418ca3..09fcefa 100644 --- a/server/player.lua +++ b/server/player.lua @@ -28,11 +28,6 @@ function QBCore.Player.Login(source, citizenid, newData) end else QBCore.Player.CheckPlayerData(source, newData) - end - for k,v in pairs(QBCore.Shared) do - if type (v) == 'table' then - TriggerClientEvent('QBCore:Client:OnSharedUpdateMultiple', source, k,v) - end end return true else From 7775667139232ede8887128996adca6e9fa04fa9 Mon Sep 17 00:00:00 2001 From: hakos Date: Thu, 28 Sep 2023 12:52:53 +0200 Subject: [PATCH 5/6] fix-lint: client/events.lua:266:63: line contains trailing whitespace --- client/events.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/events.lua b/client/events.lua index 8c645f4..6db3106 100644 --- a/client/events.lua +++ b/client/events.lua @@ -263,6 +263,6 @@ RegisterNetEvent('QBCore:Client:OnSharedUpdateMultiple', function(tableName, val TriggerEvent('QBCore:Client:UpdateObject') end) -RegisterNetEvent('QBCore:Client:SharedUpdate', function(table) +RegisterNetEvent('QBCore:Client:SharedUpdate', function(table) QBCore.Shared = table end) \ No newline at end of file From 641ea9581482765bd7498a93e5eb3fa35a97a452 Mon Sep 17 00:00:00 2001 From: Hakos <76844995+hakos47@users.noreply.github.com> Date: Sat, 30 Sep 2023 00:42:29 +0000 Subject: [PATCH 6/6] fix source --- server/events.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/events.lua b/server/events.lua index e689845..749626e 100644 --- a/server/events.lua +++ b/server/events.lua @@ -99,7 +99,7 @@ local function onPlayerConnecting(name, _, deferrals) end -- Add any additional defferals you may need! - TriggerClientEvent('QBCore:Client:SharedUpdate', QBCore.Shared) + TriggerClientEvent('QBCore:Client:SharedUpdate',src, QBCore.Shared) end AddEventHandler('playerConnecting', onPlayerConnecting)