From 39df27d1a68323aee75413510b1546df14ccc0ad Mon Sep 17 00:00:00 2001 From: Okkie-NL Date: Sat, 7 May 2022 02:06:24 +0200 Subject: [PATCH 1/7] Updated nl.lua to add missing lines Added missing translations for NL. --- locale/nl.lua | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/locale/nl.lua b/locale/nl.lua index c99d359..fd19d57 100644 --- a/locale/nl.lua +++ b/locale/nl.lua @@ -7,7 +7,10 @@ local Translations = { no_access = 'Geen toegang tot dit commando', company_too_poor = 'Je werkgever is arm', item_not_exist = 'Item bestaat niet', - too_heavy = 'Inventaris is te vol' + too_heavy = 'Inventaris is te vol', + duplicate_license = 'Dubbele Rockstar-licentie gevonden', + no_valid_license = 'Geen geldige Rockstar-licentie gevonden', + not_whitelisted = 'Je staat niet op de whitelist voor deze server' }, success = {}, info = { @@ -15,7 +18,10 @@ local Translations = { job_info = 'Baan: %{value} | Rang: %{value2} | In dienst: %{value3}', gang_info = 'Gang: %{value} | Rang: %{value2}', on_duty = 'Je bent nu in dienst!', - off_duty = 'Je bent nu uit dienst!' + off_duty = 'Je bent nu uit dienst!', + checking_ban = 'Hallo %s. We controleren of je verbannen bent.', + join_server = 'Welkom %s bij {Server Name}.', + checking_whitelisted = 'Hallo %s. We controleren of je op de whitelist staat.' } } From bdd95c074feb5af3c276a964fb9145addd549233 Mon Sep 17 00:00:00 2001 From: almez <57301625+serhatalmez@users.noreply.github.com> Date: Tue, 10 May 2022 21:00:17 +0300 Subject: [PATCH 2/7] Update exports.lua --- server/exports.lua | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/server/exports.lua b/server/exports.lua index 2cfed5a..221f953 100644 --- a/server/exports.lua +++ b/server/exports.lua @@ -65,6 +65,22 @@ end QBCore.Functions.AddItem = AddItem exports('AddItem', AddItem) +-- Single update item +local function UpdateItem(itemName, item) + if type(itemName) ~= "string" then + return false, "invalid_item_name" + end + if not QBCore.Shared.Items[itemName] then + return false, "item_not_exists" + end + QBCore.Shared.Items[itemName] = item + TriggerClientEvent('QBCore:Client:OnSharedUpdate', -1, 'Items', itemName, item) + TriggerEvent('QBCore:Server:UpdateObject') + return true, "success" +end +QBCore.Functions.UpdateItem = UpdateItem +exports('UpdateItem', UpdateItem) + -- Multiple Add Items local function AddItems(items) local shouldContinue = true From bc95a864b9ff147d973c4e52e70dc061b1b49742 Mon Sep 17 00:00:00 2001 From: Lionh34rt <76415140+Lionh34rt@users.noreply.github.com> Date: Mon, 6 Jun 2022 03:34:48 +0200 Subject: [PATCH 3/7] ExploitBan export This export allows you to use it any script for exploit checks. Instead of having to define the function in multiple scripts like: exports['qb-core']:ExploitBan(source, "pawn-shop") https://github.com/qbcore-framework/qb-pawnshop/commit/8e81307cbabc3607fe4a82f88abf13765b35cf2f --- server/exports.lua | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/server/exports.lua b/server/exports.lua index 2cfed5a..9f7b5c1 100644 --- a/server/exports.lua +++ b/server/exports.lua @@ -152,3 +152,19 @@ local function GetCoreVersion(InvokingResource) end QBCore.Functions.GetCoreVersion = GetCoreVersion exports('GetCoreVersion', GetCoreVersion) + +local function ExploitBan(playerId, origin) + local name = GetPlayerName(playerId) + MySQL.insert('INSERT INTO bans (name, license, discord, ip, reason, expire, bannedby) VALUES (?, ?, ?, ?, ?, ?, ?)', { + name, + QBCore.Functions.GetIdentifier(playerId, 'license'), + QBCore.Functions.GetIdentifier(playerId, 'discord'), + QBCore.Functions.GetIdentifier(playerId, 'ip'), + origin, + 2147483647, + 'Anti Cheat' + }) + DropPlayer(playerId, "You have been banned for cheating. Check our Discord for more information: " .. QBCore.Config.Server.Discord) + TriggerEvent("qb-log:server:CreateLog", "anticheat", "Anti-Cheat", "red", name.." has been banned for exploiting "..origin, true) +end +exports('ExploitBan', ExploitBan) From 8062549f1b3139d8b09dc996b0e41ee5cad5ed27 Mon Sep 17 00:00:00 2001 From: Lionh34rt <76415140+Lionh34rt@users.noreply.github.com> Date: Wed, 8 Jun 2022 17:26:49 +0200 Subject: [PATCH 4/7] fix(server): linting issues --- server/exports.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/exports.lua b/server/exports.lua index 9f7b5c1..c96b827 100644 --- a/server/exports.lua +++ b/server/exports.lua @@ -166,5 +166,5 @@ local function ExploitBan(playerId, origin) }) DropPlayer(playerId, "You have been banned for cheating. Check our Discord for more information: " .. QBCore.Config.Server.Discord) TriggerEvent("qb-log:server:CreateLog", "anticheat", "Anti-Cheat", "red", name.." has been banned for exploiting "..origin, true) -end +end exports('ExploitBan', ExploitBan) From a48e11de866d28c66780fafcd0f55ec3430e50aa Mon Sep 17 00:00:00 2001 From: nzkfc Date: Fri, 10 Jun 2022 22:10:44 +1200 Subject: [PATCH 5/7] Forces cars to spawn clean Will ensure cars spawn cleaned instead of random levels of dirt. --- client/events.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/client/events.lua b/client/events.lua index 6ed07e4..c0b2597 100644 --- a/client/events.lua +++ b/client/events.lua @@ -134,6 +134,7 @@ RegisterNetEvent('QBCore:Command:SpawnVehicle', function(vehName) local vehicle = CreateVehicle(hash, GetEntityCoords(ped), GetEntityHeading(ped), true, false) TaskWarpPedIntoVehicle(ped, vehicle, -1) SetVehicleFuelLevel(vehicle, 100.0) + SetVehicleDirtLevel(vehicle, 0.0) SetModelAsNoLongerNeeded(hash) TriggerEvent("vehiclekeys:client:SetOwner", QBCore.Functions.GetPlate(vehicle)) end) From 480e3030bcb19e508f786be2008d0cb5cb57f45f Mon Sep 17 00:00:00 2001 From: RC <82515416+LuquinhasVulgoRC@users.noreply.github.com> Date: Mon, 13 Jun 2022 19:02:59 -0300 Subject: [PATCH 6/7] Create pt-br.lua --- locale/pt-br.lua | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 locale/pt-br.lua diff --git a/locale/pt-br.lua b/locale/pt-br.lua new file mode 100644 index 0000000..9621437 --- /dev/null +++ b/locale/pt-br.lua @@ -0,0 +1,31 @@ +local Translations = { + error = { + not_online = 'O jogador não está online', + wrong_format = 'Formato inválido', + missing_args = 'Nem todos os argumentos foram inseridos (x, y, z)', + missing_args2 = 'Todos os argumentos devem ser preenchidos!', + no_access = 'Sem acesso a este comando', + company_too_poor = 'Sua compania está quebrada', + item_not_exist = 'O item não existe', + too_heavy = 'Inventário cheio', + duplicate_license = 'Licença duplicada da Rockstar encontrada', + no_valid_license = 'Nenhuma licença válida da Rockstar encontrada', + not_whitelisted = 'Você não tem whitelist neste servidor' + }, + success = {}, + info = { + received_paycheck = 'Você recebeu seu salário de %{value}€', + job_info = 'Emprego: %{value} | Grau: %{value2} | Serviço: %{value3}', + gang_info = 'Gang: %{value} | Grau: %{value2}', + on_duty = 'Você agora está de plantão!', + off_duty = 'Você agora está de folga!', + checking_ban = 'Olá %s. Estamos verificando se você foi banido.', + join_server = 'Bem-vindo %s a {Server Name}.', + checking_whitelisted = 'Olá %s. Estamos verificando sua whitelist.' + } +} + +Lang = Locale:new({ + phrases = Translations, + warnOnMissing = true +}) From e8dd5941f4a069d9ce48167d4716e7f211082b4b Mon Sep 17 00:00:00 2001 From: Kakarot <57848836+GhzGarage@users.noreply.github.com> Date: Wed, 15 Jun 2022 15:03:06 -0700 Subject: [PATCH 7/7] Prevent error --- server/events.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/server/events.lua b/server/events.lua index 266dfa5..3b2ceab 100644 --- a/server/events.lua +++ b/server/events.lua @@ -135,14 +135,13 @@ end) RegisterNetEvent('QBCore:Server:SetMetaData', function(meta, data) local src = source local Player = QBCore.Functions.GetPlayer(src) + if not Player then return end if meta == 'hunger' or meta == 'thirst' then if data > 100 then data = 100 end end - if Player then - Player.Functions.SetMetaData(meta, data) - end + Player.Functions.SetMetaData(meta, data) TriggerClientEvent('hud:client:UpdateNeeds', src, Player.PlayerData.metadata['hunger'], Player.PlayerData.metadata['thirst']) end)