fix: minor fixes

Incorrect table indexes.
Don't send empty parameters in queries.
Incorrect use of MySQL.scalar.await.
This commit is contained in:
Linden
2022-01-19 21:14:47 +11:00
parent dbb7da7755
commit 181508cbf2
7 changed files with 7 additions and 14 deletions
@@ -286,9 +286,7 @@ end)
ESX.RegisterServerCallback('esx_ambulancejob:getDeathStatus', function(source, cb)
local xPlayer = ESX.GetPlayerFromId(source)
MySQL.scalar.await('SELECT is_dead FROM users WHERE identifier = ?', {xPlayer.identifier},
function(isDead)
MySQL.scalar('SELECT is_dead FROM users WHERE identifier = ?', {xPlayer.identifier}, function(isDead)
if isDead then
print(('[esx_ambulancejob] [^2INFO^7] "%s" attempted combat logging'):format(xPlayer.identifier))
end
-1
View File
@@ -149,7 +149,6 @@ Config.Jobs.fisherman = {
Pos = {x = -1012.64, y = -1354.62, z = 5.54},
Color = {r = 204, g = 204, b = 0},
Size = {x = 5.0, y = 5.0, z = 3.0},
Color = {r = 204, g = 204, b = 0},
Marker= 1,
Blip = true,
Name = _U('delivery_point'),
-3
View File
@@ -196,7 +196,6 @@ Config.Jobs.miner = {
Pos = {x = -148.78, y = -1040.38, z = 26.27},
Color = {r = 204, g = 204, b = 0},
Size = {x = 5.0, y = 5.0, z = 3.0},
Color = {r = 204, g = 204, b = 0},
Marker = 1,
Blip = true,
Name = _U('m_sell_iron'),
@@ -222,7 +221,6 @@ Config.Jobs.miner = {
Pos = {x = 261.48, y = 207.35, z = 109.28},
Color = {r = 204, g = 204, b = 0},
Size = {x = 5.0, y = 5.0, z = 3.0},
Color = {r = 204, g = 204, b = 0},
Marker = 1,
Blip = true,
Name = _U('m_sell_gold'),
@@ -248,7 +246,6 @@ Config.Jobs.miner = {
Pos = {x = -621.04, y = -228.53, z = 37.05},
Color = {r = 204, g = 204, b = 0},
Size = {x = 5.0, y = 5.0, z = 3.0},
Color = {r = 204, g = 204, b = 0},
Marker = 1,
Blip = true,
Name = _U('m_sell_diamond'),
+1 -1
View File
@@ -53,7 +53,7 @@ end)
ESX.RegisterServerCallback('esx_lscustom:getVehiclesPrices', function(source, cb)
if not Vehicles then
Vehicles = MySQL.query.await('SELECT model, price FROM vehicles', {})
Vehicles = MySQL.query.await('SELECT model, price FROM vehicles')
end
cb(Vehicles)
end)
+1 -1
View File
@@ -73,7 +73,7 @@ Locales['fr'] = {
['not_enough_gas_can'] = 'Vous n\'avez ~r~pas assez~s~ de bouteille de gaz',
['assembling_blowtorch'] = 'Assemblage de ~b~chalumeaux~s~...',
['not_enough_repair_tools'] = 'Vous n\'avez ~r~pas assez~s~ d\'outils réparation',
['assembling_blowtorch'] = 'Assemblage de ~b~kit réparation~s~...',
['assembling_repair_kit'] = 'Assemblage de ~b~kit réparation~s~...',
['not_enough_body_tools'] = 'Vous n\'avez ~r~pas assez~s~ d\'outils carosserie',
['assembling_body_kit'] = 'Assemblage de ~b~kit carosserie~s~...',
['your_comp_earned'] = 'Votre société a ~g~gagné~s~ ~g~$',
+2 -2
View File
@@ -11,14 +11,14 @@ end
AddEventHandler('onResourceStart', function(resourceName)
if resourceName == GetCurrentResourceName() then
local result = MySQL.query.await('SELECT * FROM jobs', {})
local result = MySQL.query.await('SELECT * FROM jobs')
for i = 1, #result, 1 do
Jobs[result[i].name] = result[i]
Jobs[result[i].name].grades = {}
end
local result2 = MySQL.query.await('SELECT * FROM job_grades', {})
local result2 = MySQL.query.await('SELECT * FROM job_grades')
for i = 1, #result2, 1 do
Jobs[result2[i].job_name].grades[tostring(result2[i].grade)] = result2[i]
+2 -3
View File
@@ -24,9 +24,8 @@ AddEventHandler('onResourceStart', function(resourceName)
end)
function SQLVehiclesAndCategories()
categories = MySQL.query.await('SELECT * FROM vehicle_categories', {})
vehicles = MySQL.query.await('SELECT * FROM vehicles', {})
categories = MySQL.query.await('SELECT * FROM vehicle_categories')
vehicles = MySQL.query.await('SELECT * FROM vehicles')
GetVehiclesAndCategories(categories, vehicles)
end