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

Closes #130, updated to support new vehicle db system

Browse Source
This commit is contained in:
ElPumpo
2018-07-25 12:11:04 +02:00
parent b3a8b6ddb5
commit 5926584595
11 changed files with 83 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/main.lua
+34 -106
View File
@@ -226,114 +226,32 @@ end)
ESX.RegisterServerCallback('esx_policejob:getVehicleInfos', function(source, cb, plate)
if Config.EnableESXIdentity then
MySQL.Async.fetchAll('SELECT * FROM owned_vehicles WHERE @plate = plate', {
['@plate'] = plate
}, function(result)
MySQL.Async.fetchAll(
'SELECT * FROM owned_vehicles',
{},
function(result)
local retrivedInfo = {
plate = plate
}
local foundIdentifier = nil
if result[1] then
for i=1, #result, 1 do
MySQL.Async.fetchAll('SELECT * FROM users WHERE identifier = @identifier', {
['@identifier'] = result[1].owner
}, function(result2)
local vehicleData = json.decode(result[i].vehicle)
if vehicleData.plate == plate then
foundIdentifier = result[i].owner
break
end
end
if foundIdentifier ~= nil then
MySQL.Async.fetchAll(
'SELECT * FROM users WHERE identifier = @identifier',
{
['@identifier'] = foundIdentifier
},
function(result)
local ownerName = result[1].firstname .. " " .. result[1].lastname
local infos = {
plate = plate,
owner = ownerName
}
cb(infos)
end
)
else
local infos = {
plate = plate
}
cb(infos)
end
end
)
else
MySQL.Async.fetchAll(
'SELECT * FROM owned_vehicles',
{},
function(result)
local foundIdentifier = nil
for i=1, #result, 1 do
local vehicleData = json.decode(result[i].vehicle)
if vehicleData.plate == plate then
foundIdentifier = result[i].owner
break
end
end
if foundIdentifier ~= nil then
MySQL.Async.fetchAll(
'SELECT * FROM users WHERE identifier = @identifier',
{
['@identifier'] = foundIdentifier
},
function(result)
local infos = {
plate = plate,
owner = result[1].name
}
cb(infos)
end
)
else
local infos = {
plate = plate
}
cb(infos)
end
end
)
end
if Config.EnableESXIdentity then
retrivedInfo.owner = result2[1].firstname .. ' ' .. result2[1].lastname
else
retrivedInfo.owner = result2[1].name
end
cb(retrivedInfo)
end)
else
cb(retrivedInfo)
end
end)
end)
ESX.RegisterServerCallback('esx_policejob:getVehicleFromPlate', function(source, cb, plate)
@@ -344,10 +262,20 @@ ESX.RegisterServerCallback('esx_policejob:getVehicleFromPlate', function(source,
},
function(result)
if result[1] ~= nil then
local playerName = ESX.GetPlayerFromIdentifier(result[1].owner).name
cb(playerName, true)
MySQL.Async.fetchAll('SELECT * FROM users WHERE identifier = @identifier', {
['@identifier'] = result[1].owner
}, function(result2)
if Config.EnableESXIdentity then
cb(result2[1].firstname .. ' ' .. result2[1].lastname, true)
else
cb(result2[1].name, true)
end
end)
else
cb('unknown', false)
cb(_U('unknown'), false)
end
end
)