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

Merge branch 'esx-framework:main' into main

Browse Source
This commit is contained in:
bitpredator
2022-09-26 21:38:41 +02:00
committed by GitHub
parent 1eb8496177 b1967b477b
commit 20c55d7d26
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[esx]/es_extended/client/main.lua
+2 -2
View File
@@ -274,7 +274,7 @@ if not Config.OxInventory then
RegisterNetEvent('esx:setWeaponAmmo')
AddEventHandler('esx:setWeaponAmmo', function(weapon, weaponAmmo)
print("[^1ERROR^7] event ^5'esx:setWeaponAmmo'^7 Has Been Removed. Please use ^5xPlayer.addWeaponComponent^7 Instead!")
print("[^1ERROR^7] event ^5'esx:setWeaponAmmo'^7 Has Been Removed. Please use ^5xPlayer.addWeaponAmmo^7 Instead!")
end)
RegisterNetEvent('esx:setWeaponTint')
@@ -757,4 +757,4 @@ for i=1, #DoNotUse do
if GetResourceState(DoNotUse[i]) == 'started' or GetResourceState(DoNotUse[i]) == 'starting' then
print("[^1ERROR^7] YOU ARE USING A RESOURCE THAT WILL BREAK ^1ESX^7, PLEASE REMOVE ^5"..DoNotUse[i].."^7")
end
end
end
[esx_addons]/esx_property/client/main.lua
+1 -1
View File
@@ -350,7 +350,7 @@ function OpenPropertyMenu(PropertyId)
if element.value == "property_raid" then
ESX.TriggerServerCallback("esx_property:CanRaid", function(CanRaid)
if CanRaid then
ESX.Progressbar(U("prep_raid"), 15000, {FreezePlayer = true, animation = Config.Raiding.Animation, onFinish = function()
ESX.Progressbar(_U("prep_raid"), 15000, {FreezePlayer = true, animation = Config.Raiding.Animation, onFinish = function()
ESX.ShowNotification(_U("raiding"), "success")
AttemptHouseEntry(PropertyId)
end, onCancel = function()