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

Fixed searching for vehicles, closes #398

Browse Source 
Co-Authored-By: mortdudley <mortdudley@users.noreply.github.com>
This commit is contained in:
ElPumpo
2020-02-12 10:48:21 +01:00
co-authored by mortdudley
parent 259cbc5b08
commit f83e05c83b
12 changed files with 25 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/main.lua
+20 -10
View File
@@ -543,17 +543,28 @@ function LookupVehicle()
title = _U('search_database_title'),
}, function(data, menu)
local length = string.len(data.value)
if data.value == nil or length < 2 or length > 13 then
if not data.value or length < 2 or length > 8 then
ESX.ShowNotification(_U('search_database_error_invalid'))
else
ESX.TriggerServerCallback('esx_policejob:getVehicleFromPlate', function(owner, found)
if found then
ESX.ShowNotification(_U('search_database_found', owner))
ESX.TriggerServerCallback('esx_policejob:getVehicleInfos', function(retrivedInfo)
local elements = {{label = _U('plate', retrivedInfo.plate)}}
menu.close()
if not retrivedInfo.owner then
table.insert(elements, {label = _U('owner_unknown')})
else
ESX.ShowNotification(_U('search_database_error_not_found'))
table.insert(elements, {label = _U('owner', retrivedInfo.owner)})
end
ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'vehicle_infos', {
title = _U('vehicle_info'),
align = 'top-left',
elements = elements
}, nil, function(data2, menu2)
menu2.close()
end)
end, data.value)
menu.close()
end
end, function(data, menu)
menu.close()
@@ -620,7 +631,7 @@ function OpenVehicleInfosMenu(vehicleData)
ESX.TriggerServerCallback('esx_policejob:getVehicleInfos', function(retrivedInfo)
local elements = {{label = _U('plate', retrivedInfo.plate)}}
if retrivedInfo.owner == nil then
if not retrivedInfo.owner then
table.insert(elements, {label = _U('owner_unknown')})
else
table.insert(elements, {label = _U('owner', retrivedInfo.owner)})
@@ -699,7 +710,6 @@ end
function OpenBuyWeaponsMenu()
local elements = {}
local playerPed = PlayerPedId()
PlayerData = ESX.GetPlayerData()
for k,v in ipairs(Config.AuthorizedWeapons[ESX.PlayerData.job.grade_name]) do
local weaponNum, weapon = ESX.GetWeapon(v.weapon)
@@ -836,7 +846,7 @@ function OpenGetStocksMenu()
}, function(data2, menu2)
local count = tonumber(data2.value)
if count == nil then
if not count then
ESX.ShowNotification(_U('quantity_invalid'))
else
menu2.close()
@@ -883,7 +893,7 @@ function OpenPutStocksMenu()
}, function(data2, menu2)
local count = tonumber(data2.value)
if count == nil then
if not count then
ESX.ShowNotification(_U('quantity_invalid'))
else
menu2.close()