From aaa681fdd4ce1c94131bba68211aa4894f6f72f8 Mon Sep 17 00:00:00 2001 From: Joel <34402846+Qwerty1Verified@users.noreply.github.com> Date: Mon, 6 Oct 2025 13:39:11 -0400 Subject: [PATCH] fix: append source id to prevent client callback collisions --- server/events.lua | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/server/events.lua b/server/events.lua index 00b0fa5..bd45ec6 100644 --- a/server/events.lua +++ b/server/events.lua @@ -124,14 +124,15 @@ end) -- Client Callback RegisterNetEvent('QBCore:Server:TriggerClientCallback', function(name, ...) - if QBCore.ClientCallbacks[name] then - QBCore.ClientCallbacks[name].promise:resolve(...) + local ClientCallback = QBCore.ClientCallbacks[name..source] + if ClientCallback then + ClientCallback.promise:resolve(...) - if QBCore.ClientCallbacks[name].callback then - QBCore.ClientCallbacks[name].callback(...) + if ClientCallback.callback then + ClientCallback.callback(...) end - QBCore.ClientCallbacks[name] = nil + QBCore.ClientCallbacks[name..source] = nil end end)