starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-29 01:08:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(es_extended): ServerCallbacks now invoking aware

Browse Source
This commit is contained in:
Mycroft
2022-09-23 00:28:48 +01:00
parent 663a84ca9a
commit 449ef36879
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[esx]/es_extended/client/functions.lua
+2 -1
View File
@@ -201,9 +201,10 @@ ESX.RegisterInput = function(command_name, label, input_group, key, on_press, on
end
function ESX.TriggerServerCallback(name, cb, ...)
local Invoke = GetInvokingResource() or "unknown"
Core.ServerCallbacks[Core.CurrentRequestId] = cb
TriggerServerEvent('esx:triggerServerCallback', name, Core.CurrentRequestId, ...)
TriggerServerEvent('esx:triggerServerCallback', name, Core.CurrentRequestId,Invoke, ...)
Core.CurrentRequestId = Core.CurrentRequestId < 65535 and Core.CurrentRequestId + 1 or 0
end
[esx]/es_extended/server/common.lua
+4 -4
View File
@@ -106,10 +106,10 @@ AddEventHandler('esx:clientLog', function(msg)
end)
RegisterServerEvent('esx:triggerServerCallback')
AddEventHandler('esx:triggerServerCallback', function(name, requestId, ...)
local playerId = source
AddEventHandler('esx:triggerServerCallback', function(name, requestId,Invoke, ...)
local source = source
ESX.TriggerServerCallback(name, requestId, playerId, function(...)
TriggerClientEvent('esx:serverCallback', playerId, requestId, ...)
ESX.TriggerServerCallback(name, requestId, source,Invoke, function(...)
TriggerClientEvent('esx:serverCallback', source, requestId, ...)
end, ...)
end)
[esx]/es_extended/server/functions.lua
+2 -2
View File
@@ -167,11 +167,11 @@ function ESX.RegisterServerCallback(name, cb)
Core.ServerCallbacks[name] = cb
end
function ESX.TriggerServerCallback(name, requestId, source, cb, ...)
function ESX.TriggerServerCallback(name, requestId, source,Invoke, cb, ...)
if Core.ServerCallbacks[name] then
Core.ServerCallbacks[name](source, cb, ...)
else
print(('[^3WARNING^7] Server callback ^5%s^0 does not exist. Please Check The Server File for ^1Errors^7!'):format(name))
print(('[^1ERROR^7] Server callback ^5"%s"^0 does not exist. Please Check ^5%s^7 for Errors!'):format(name, Invoke))
end
end