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

Merge pull request #32 from KandaSoranyan/patch-4

Browse Source 
Fixed glitchs
This commit is contained in:
Don
2018-01-15 08:55:26 -08:00
committed by GitHub
parent 3a7016d57a 4a6ee74ab7
commit 3499f1fc00
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/functions.lua
+19 -8
View File
@@ -1159,17 +1159,24 @@ ESX.ShowInventory = function()
local item = data.current.value
local type = data.current.type
if data.current.action == 'give' then
if data.current.action == 'give' then
if type == 'item_weapon' then
local closestPlayer, closestDistance = ESX.Game.GetClosestPlayer()
local closestPed = GetPlayerPed(closestPlayer)
if closestPlayer == -1 or closestDistance > 3.0 then
ESX.ShowNotification(_U('players_nearby'))
else
if closestPlayer ~= -1 or closestDistance > 3.0 then
-- PERSONNE
if not IsPedSittingInAnyVehicle(closestPed) then
TriggerServerEvent('esx:giveInventoryItem', GetPlayerServerId(closestPlayer), type, item, 1)
else
ESX.ShowNotification(_U("in_vehicle"))
end
else
ESX.ShowNotification(_U('players_nearby'))
end
menu.close()
else
@@ -1182,11 +1189,15 @@ ESX.ShowInventory = function()
local quantity = tonumber(data2.value)
local closestPlayer, closestDistance = ESX.Game.GetClosestPlayer()
if closestPlayer == -1 or closestDistance > 3.0 then
ESX.ShowNotification(_U('players_nearby'))
local closestPed = GetPlayerPed(closestPlayer)
if not IsPedSittingInAnyVehicle(closestPed) then
if closestPlayer ~= -1 or closestDistance < 3.0 then
TriggerServerEvent('esx:giveInventoryItem', GetPlayerServerId(closestPlayer), type, item, quantity)
else
ESX.ShowNotification(_U('players_nearby'))
end
else
TriggerServerEvent('esx:giveInventoryItem', GetPlayerServerId(closestPlayer), type, item, quantity)
ESX.ShowNotification(_U("in_vehicle"))
end
menu2.close()