From 934567c7da5c564a675f6e6811d70851f0a7f7b4 Mon Sep 17 00:00:00 2001 From: Manason Date: Thu, 1 Jun 2023 23:29:22 -0700 Subject: [PATCH] refactor: switch callback system (#6) --- client.lua | 4 +++- server.lua | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/client.lua b/client.lua index 862c377..84f8a9a 100644 --- a/client.lua +++ b/client.lua @@ -170,7 +170,9 @@ RegisterNetEvent("hud:client:resetStorage", function() if Menu.isResetSoundsChecked then TriggerServerEvent("InteractSound_SV:PlayOnSource", "airwrench", 0.1) end - QBCore.Functions.TriggerCallback('hud:server:getMenu', function(menu) loadSettings(menu); SetResourceKvp('hudSettings', json.encode(menu)) end) + local menu = lib.callback.await('hud:server:getMenu') + loadSettings(menu) + SetResourceKvp('hudSettings', json.encode(menu)) end) -- Notifications diff --git a/server.lua b/server.lua index ba7fa94..69bbc20 100644 --- a/server.lua +++ b/server.lua @@ -81,6 +81,6 @@ RegisterNetEvent('hud:server:RelieveStress', function(amount) }) end) -QBCore.Functions.CreateCallback('hud:server:getMenu', function(_, cb) - cb(Config.Menu) +lib.callback.register('hud:server:getMenu', function() + return Config.Menu end)