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

Merge pull request #419 from thelindat/patch-1

Browse Source 
fix(esx/server): use protected calls for Item Callbacks
This commit is contained in:
Mycroft
2022-08-25 13:12:27 +01:00
committed by GitHub
parent 7abb59021d 9fc382bbe0
commit 79640704e3
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[esx]/es_extended/server/functions.lua
+8 -2
View File
@@ -311,8 +311,14 @@ end
function ESX.UseItem(source, item, ...)
if ESX.Items[item] then
if Core.UsableItemsCallbacks[item] then
Core.UsableItemsCallbacks[item](source, item, ...)
local itemCallback = Core.UsableItemsCallbacks[item]
if itemCallback then
local success, result = pcall(itemCallback, source, item, ...)
if not success then
return result and print(result) or print(('[^3WARNING^7] An error occured when using item ^5"%s"^7! This was not caused by ESX.'):format(item))
end
end
else
print(('[^3WARNING^7] Item ^5"%s"^7 was used but does not exist!'):format(item))