From b9576a6084565760464eb4c52789812d9069e77e Mon Sep 17 00:00:00 2001 From: KamuiKody <62488881+KamuiKody@users.noreply.github.com> Date: Wed, 19 Oct 2022 01:46:04 -0400 Subject: [PATCH 1/4] Replace breaks with Returns currently when adding multiple jobs or items or gangs if there is a duplicate it breaks the loop instead of returning and going to the next item. --- server/exports.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/exports.lua b/server/exports.lua index f080732..9e06f75 100644 --- a/server/exports.lua +++ b/server/exports.lua @@ -61,14 +61,14 @@ local function AddJobs(jobs) message = 'invalid_job_name' shouldContinue = false errorItem = jobs[key] - break + return end if QBCore.Shared.Jobs[key] then message = 'job_exists' shouldContinue = false errorItem = jobs[key] - break + return end QBCore.Shared.Jobs[key] = value @@ -171,14 +171,14 @@ local function AddItems(items) message = "invalid_item_name" shouldContinue = false errorItem = items[key] - break + return end if QBCore.Shared.Items[key] then message = "item_exists" shouldContinue = false errorItem = items[key] - break + return end QBCore.Shared.Items[key] = value @@ -244,14 +244,14 @@ local function AddGangs(gangs) message = "invalid_gang_name" shouldContinue = false errorItem = gangs[key] - break + return end if QBCore.Shared.Gangs[key] then message = "gang_exists" shouldContinue = false errorItem = gangs[key] - break + return end QBCore.Shared.Gangs[key] = value From daef1859b9ebffe9258b5324c38dfa9f43953740 Mon Sep 17 00:00:00 2001 From: KamuiKody <62488881+KamuiKody@users.noreply.github.com> Date: Wed, 19 Oct 2022 02:00:42 -0400 Subject: [PATCH 2/4] lint fail From 5fd425fb1aae585dc1486fe66558b4203b6554cc Mon Sep 17 00:00:00 2001 From: Stevie Date: Wed, 2 Nov 2022 06:58:33 +0000 Subject: [PATCH 3/4] Update vehicles.lua --- shared/vehicles.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shared/vehicles.lua b/shared/vehicles.lua index 627b5ae..82fbffb 100644 --- a/shared/vehicles.lua +++ b/shared/vehicles.lua @@ -266,7 +266,7 @@ QBShared.Vehicles = { }, ['sentinel2'] = { ['name'] = 'Sentinel XS', - ['brand'] = ' Übermacht', + ['brand'] = 'Übermacht', ['model'] = 'sentinel2', ['price'] = 33000, ['category'] = 'coupes', @@ -3193,7 +3193,7 @@ QBShared.Vehicles = { }, ['surano'] = { ['name'] = 'Surano', - ['brand'] = ' Benefactor', + ['brand'] = 'Benefactor', ['model'] = 'surano', ['price'] = 80000, ['category'] = 'sports', @@ -4145,7 +4145,7 @@ QBShared.Vehicles = { }, ['tyrant'] = { ['name'] = 'Tyrant', - ['brand'] = ' Överflöd', + ['brand'] = 'Överflöd', ['model'] = 'tyrant', ['price'] = 2100000, ['category'] = 'super', From d41d1a5f50a05fcb8263b962cbce3e5684b14ddd Mon Sep 17 00:00:00 2001 From: Stevie Date: Wed, 2 Nov 2022 07:16:07 +0000 Subject: [PATCH 4/4] Update exports.lua --- server/exports.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/exports.lua b/server/exports.lua index 9e06f75..f080732 100644 --- a/server/exports.lua +++ b/server/exports.lua @@ -61,14 +61,14 @@ local function AddJobs(jobs) message = 'invalid_job_name' shouldContinue = false errorItem = jobs[key] - return + break end if QBCore.Shared.Jobs[key] then message = 'job_exists' shouldContinue = false errorItem = jobs[key] - return + break end QBCore.Shared.Jobs[key] = value @@ -171,14 +171,14 @@ local function AddItems(items) message = "invalid_item_name" shouldContinue = false errorItem = items[key] - return + break end if QBCore.Shared.Items[key] then message = "item_exists" shouldContinue = false errorItem = items[key] - return + break end QBCore.Shared.Items[key] = value @@ -244,14 +244,14 @@ local function AddGangs(gangs) message = "invalid_gang_name" shouldContinue = false errorItem = gangs[key] - return + break end if QBCore.Shared.Gangs[key] then message = "gang_exists" shouldContinue = false errorItem = gangs[key] - return + break end QBCore.Shared.Gangs[key] = value