From 3c9ce7cc4c74265d15de91d318bcc3ab6da05993 Mon Sep 17 00:00:00 2001
From: Joel <34402846+Qwerty1Verified@users.noreply.github.com>
Date: Mon, 6 Oct 2025 13:41:12 -0400
Subject: [PATCH] fix: append source id when registering client callback in
 table to prevent collisions

---
 server/functions.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/functions.lua b/server/functions.lua
index c01aed2..284c65f 100644
--- a/server/functions.lua
+++ b/server/functions.lua
@@ -449,7 +449,7 @@ function QBCore.Functions.TriggerClientCallback(name, source, ...)
         table.remove(args, 1)
     end
 
-    QBCore.ClientCallbacks[name] = {
+    QBCore.ClientCallbacks[name..source] = {
         callback = cb,
         promise = promise.new()
     }
@@ -457,8 +457,8 @@ function QBCore.Functions.TriggerClientCallback(name, source, ...)
     TriggerClientEvent('QBCore:Client:TriggerClientCallback', source, name, table.unpack(args))
 
     if cb == nil then
-        Citizen.Await(QBCore.ClientCallbacks[name].promise)
-        return QBCore.ClientCallbacks[name].promise.value
+        Citizen.Await(QBCore.ClientCallbacks[name..source].promise)
+        return QBCore.ClientCallbacks[name..source].promise.value
     end
 end