From 1225b619a18ab54d46597e09909cd688990d68b5 Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Wed, 28 Aug 2024 12:33:25 +0200 Subject: [PATCH 1/3] chore: esx-qalle-jail\client\utils.lua minor fix --- .../[esx_addons]/esx-qalle-jail/client/utils.lua | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/server-data/resources/[esx_addons]/esx-qalle-jail/client/utils.lua b/server-data/resources/[esx_addons]/esx-qalle-jail/client/utils.lua index 3c6992ffe..068f6ddc1 100644 --- a/server-data/resources/[esx_addons]/esx-qalle-jail/client/utils.lua +++ b/server-data/resources/[esx_addons]/esx-qalle-jail/client/utils.lua @@ -41,13 +41,10 @@ end function Cutscene() DoScreenFadeOut(100) - Wait(250) - - local Male = GetHashKey("mp_m_freemode_01") - TriggerEvent("skinchanger:getSkin", function(skin) - if GetHashKey(GetEntityModel(PlayerPedId())) == Male then + local hash = GetEntityModel(PlayerPedId()) + if hash == "mp_m_freemode_01" then local clothesSkin = { ["tshirt_1"] = 20, ["tshirt_2"] = 15, @@ -171,6 +168,6 @@ CreateThread(function() SetBlipColour(blip, 49) SetBlipAsShortRange(blip, true) BeginTextCommandSetBlipName("STRING") - AddTextComponentString("Boilingbroke Penitentiary") + AddTextComponentString("Penitentiary") EndTextCommandSetBlipName(blip) end) From 42ee4860feeabcf1d02e1b15881fa98e4b532798 Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Sun, 1 Sep 2024 18:29:01 +0200 Subject: [PATCH 2/3] chore: fixed formatting errors in some functions --- .../[bpt_addons]/bpt_crafting/client/main.lua | 8 ++++---- .../[bpt_addons]/bpt_crafting/config.lua | 2 +- .../[bpt_addons]/bpt_crafting/html/script.js | 5 ----- .../[bpt_addons]/bpt_crafting/server/main.lua | 20 +++++++++---------- 4 files changed, 15 insertions(+), 20 deletions(-) diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/client/main.lua b/server-data/resources/[bpt_addons]/bpt_crafting/client/main.lua index ce383af6d..09107e582 100644 --- a/server-data/resources/[bpt_addons]/bpt_crafting/client/main.lua +++ b/server-data/resources/[bpt_addons]/bpt_crafting/client/main.lua @@ -103,7 +103,7 @@ AddEventHandler("esx:setJob", function(j) grade = j.grade end) -function isNearWorkbench() +function IsNearWorkbench() local ped = PlayerPedId() local coords = GetEntityCoords(ped) local near = false @@ -126,7 +126,7 @@ CreateThread(function() while true do Wait(1000) if craftingQueue[1] ~= nil then - if not Config.CraftingStopWithDistance or (Config.CraftingStopWithDistance and isNearWorkbench()) then + if not Config.CraftingStopWithDistance or (Config.CraftingStopWithDistance and IsNearWorkbench()) then craftingQueue[1].time = craftingQueue[1].time - 1 SendNUIMessage({ @@ -145,7 +145,7 @@ CreateThread(function() end end) -function openWorkbench(val) +function OpenWorkbench(val) ESX.TriggerServerCallback("bpt_crafting:getXP", function(xp) SetNuiFocus(true, true) TriggerScreenblurFadeIn(1000) @@ -200,7 +200,7 @@ CreateThread(function() end if open or #v.jobs == 0 then - openWorkbench(v) + OpenWorkbench(v) else ESX.ShowNotification(TranslateCap("wrong_job")) end diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/config.lua b/server-data/resources/[bpt_addons]/bpt_crafting/config.lua index b3af09502..b206d20cb 100644 --- a/server-data/resources/[bpt_addons]/bpt_crafting/config.lua +++ b/server-data/resources/[bpt_addons]/bpt_crafting/config.lua @@ -173,7 +173,7 @@ Config = { requireBlueprint = false, Time = 60, Ingredients = { - ["iron"] = 4, + ["iron"] = 2, ["wood"] = 1, }, }, diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/html/script.js b/server-data/resources/[bpt_addons]/bpt_crafting/html/script.js index f072ebe04..798891071 100644 --- a/server-data/resources/[bpt_addons]/bpt_crafting/html/script.js +++ b/server-data/resources/[bpt_addons]/bpt_crafting/html/script.js @@ -1,4 +1,3 @@ -// eslint-disable-next-line no-unused-vars let timeout; let opened; let recipes; @@ -102,7 +101,6 @@ function openCategory() { } -// eslint-disable-next-line no-unused-vars function openCrafting(t) { $('#main').html(''); @@ -287,7 +285,6 @@ function addToQueue(item, time, id) { } -// eslint-disable-next-line no-unused-vars function craft(t) { const item = t.dataset.item; $.post('https://bpt_crafting/craft', JSON.stringify({ @@ -299,11 +296,9 @@ function setProgress(p) { const prog = (398 / 100) * p; $('#u136').animate({ width: prog, - // eslint-disable-next-line no-empty-function }, 500, function() {}); } -// eslint-disable-next-line no-unused-vars function inspect(t) { if (opened != t) { opened = t; diff --git a/server-data/resources/[bpt_addons]/bpt_crafting/server/main.lua b/server-data/resources/[bpt_addons]/bpt_crafting/server/main.lua index 7b0b1b3f3..c9b521d2f 100644 --- a/server-data/resources/[bpt_addons]/bpt_crafting/server/main.lua +++ b/server-data/resources/[bpt_addons]/bpt_crafting/server/main.lua @@ -1,5 +1,5 @@ ESX = exports["es_extended"]:getSharedObject() -function setCraftingLevel(identifier, level) +function SetCraftingLevel(identifier, level) MySQL.Async.execute( "UPDATE `users` SET `crafting_level`= @xp WHERE `identifier` = @identifier", { ["@xp"] = level, ["@identifier"] = identifier }, @@ -7,7 +7,7 @@ function setCraftingLevel(identifier, level) ) end -function getCraftingLevel(identifier) +function GetCraftingLevel(identifier) return tonumber( MySQL.Sync.fetchScalar( "SELECT `crafting_level` FROM users WHERE identifier = @identifier ", @@ -16,7 +16,7 @@ function getCraftingLevel(identifier) ) end -function giveCraftingLevel(identifier, level) +function GiveCraftingLevel(identifier, level) MySQL.Async.execute( "UPDATE `users` SET `crafting_level`= `crafting_level` + @xp WHERE `identifier` = @identifier", { ["@xp"] = level, ["@identifier"] = identifier }, @@ -26,15 +26,15 @@ end RegisterServerEvent("bpt_crafting:setExperiance") AddEventHandler("bpt_crafting:setExperiance", function(identifier, xp) - setCraftingLevel(identifier, xp) + SetCraftingLevel(identifier, xp) end) RegisterServerEvent("bpt_crafting:giveExperiance") AddEventHandler("bpt_crafting:giveExperiance", function(identifier, xp) - giveCraftingLevel(identifier, xp) + GiveCraftingLevel(identifier, xp) end) -function craft(src, item, retrying) +function Craft(src, item, retrying) local xPlayer = ESX.GetPlayerFromId(src) local cancraft = true @@ -111,7 +111,7 @@ AddEventHandler("bpt_crafting:itemCrafted", function(item, count) xPlayer.addInventoryItem(item, count) end TriggerClientEvent("bpt_crafting:sendMessage", src, TranslateCap("item_crafted")) - giveCraftingLevel(xPlayer.identifier, Config.ExperiancePerCraft) + GiveCraftingLevel(xPlayer.identifier, Config.ExperiancePerCraft) else TriggerEvent("bpt_crafting:craft", item) TriggerClientEvent("bpt_crafting:sendMessage", src, TranslateCap("inv_limit_exceed")) @@ -124,7 +124,7 @@ AddEventHandler("bpt_crafting:itemCrafted", function(item, count) xPlayer.addInventoryItem(item, count) end TriggerClientEvent("bpt_crafting:sendMessage", src, TranslateCap("item_crafted")) - giveCraftingLevel(xPlayer.identifier, Config.ExperiancePerCraft) + GiveCraftingLevel(xPlayer.identifier, Config.ExperiancePerCraft) else TriggerClientEvent("bpt_crafting:sendMessage", src, TranslateCap("inv_limit_exceed")) end @@ -137,13 +137,13 @@ end) RegisterServerEvent("bpt_crafting:craft") AddEventHandler("bpt_crafting:craft", function(item, retrying) local src = source - craft(src, item, retrying) + Craft(src, item, retrying) end) ESX.RegisterServerCallback("bpt_crafting:getXP", function(source, cb) local xPlayer = ESX.GetPlayerFromId(source) - cb(getCraftingLevel(xPlayer.identifier)) + cb(GetCraftingLevel(xPlayer.identifier)) end) ESX.RegisterServerCallback("bpt_crafting:getItemNames", function(_, cb) From dc97d77018113f2051298793a80e4376773d616b Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Sun, 1 Sep 2024 19:59:26 +0200 Subject: [PATCH 3/3] chore: always make the ped visible --- .../bpt_ambulancejob/client/vehicle.lua | 6 +-- .../[bpt_addons]/bpt_boat/client/main.lua | 4 +- .../bpt_carshowroom/client/main.lua | 4 +- .../bpt_policejob/client/vehicle.lua | 6 +-- .../[esx]/esx_multicharacter/client/main.lua | 4 +- .../[esx_addons]/esx_property/client/cctv.lua | 4 +- .../esx_vehicleshop/client/main.lua | 39 +++++++------------ .../esx_vehicleshop/server/main.lua | 9 ++--- 8 files changed, 31 insertions(+), 45 deletions(-) diff --git a/server-data/resources/[bpt_addons]/bpt_ambulancejob/client/vehicle.lua b/server-data/resources/[bpt_addons]/bpt_ambulancejob/client/vehicle.lua index c307c01ae..f2d80ff0b 100644 --- a/server-data/resources/[bpt_addons]/bpt_ambulancejob/client/vehicle.lua +++ b/server-data/resources/[bpt_addons]/bpt_ambulancejob/client/vehicle.lua @@ -232,7 +232,7 @@ function OpenShopMenu(elements, restoreCoords, shopCoords) DeleteSpawnedVehicles() FreezeEntityPosition(playerPed, false) - SetEntityVisible(playerPed, true) + SetEntityVisible(PlayerPedId(), true, true) ESX.Game.Teleport(playerPed, restoreCoords) elseif element3.value == "buy" then @@ -249,7 +249,7 @@ function OpenShopMenu(elements, restoreCoords, shopCoords) ESX.CloseContext() DeleteSpawnedVehicles() FreezeEntityPosition(playerPed, false) - SetEntityVisible(playerPed, true) + SetEntityVisible(PlayerPedId(), true, true) ESX.Game.Teleport(playerPed, restoreCoords) else @@ -264,7 +264,7 @@ function OpenShopMenu(elements, restoreCoords, shopCoords) DeleteSpawnedVehicles() FreezeEntityPosition(playerPed, false) - SetEntityVisible(playerPed, true) + SetEntityVisible(PlayerPedId(), true, true) ESX.Game.Teleport(playerPed, restoreCoords) end) diff --git a/server-data/resources/[bpt_addons]/bpt_boat/client/main.lua b/server-data/resources/[bpt_addons]/bpt_boat/client/main.lua index 78034c446..8c4588d48 100644 --- a/server-data/resources/[bpt_addons]/bpt_boat/client/main.lua +++ b/server-data/resources/[bpt_addons]/bpt_boat/client/main.lua @@ -64,7 +64,7 @@ function OpenBoatShop(shop) CurrentActionMsg = TranslateCap("boat_shop_open") FreezeEntityPosition(playerPed, false) - SetEntityVisible(playerPed, true) + SetEntityVisible(PlayerPedId(), true, true) SetEntityCoords(playerPed, shop.Outside.x, shop.Outside.y, shop.Outside.z) else ESX.ShowNotification(TranslateCap("boat_shop_nomoney")) @@ -235,7 +235,7 @@ function reset(shop) CurrentActionMsg = TranslateCap("boat_shop_open") DeleteSpawnedVehicles() FreezeEntityPosition(playerPed, false) - SetEntityVisible(playerPed, true) + SetEntityVisible(PlayerPedId(), true, true) SetEntityCoords(playerPed, shop.Outside.x, shop.Outside.y, shop.Outside.z) ESX.CloseContext() end diff --git a/server-data/resources/[bpt_addons]/bpt_carshowroom/client/main.lua b/server-data/resources/[bpt_addons]/bpt_carshowroom/client/main.lua index b2d4ce7e1..c35b43b3c 100644 --- a/server-data/resources/[bpt_addons]/bpt_carshowroom/client/main.lua +++ b/server-data/resources/[bpt_addons]/bpt_carshowroom/client/main.lua @@ -143,7 +143,7 @@ function OpenShopMenu() local playerPed = PlayerPedId() FreezeEntityPosition(playerPed, true) - SetEntityVisible(playerPed, false) + SetEntityVisible(PlayerPedId(), true, true) SetEntityCoords(playerPed, Config.Zones.ShopInside.Pos.x, Config.Zones.ShopInside.Pos.y, Config.Zones.ShopInside.Pos.z) local vehiclesByCategory = {} @@ -226,7 +226,7 @@ function OpenShopMenu() FreezeEntityPosition(playerPed, false) SetEntityCoords(playerPed, Config.Zones.Katalog.Pos.x, Config.Zones.Katalog.Pos.y, Config.Zones.Katalog.Pos.z) - SetEntityVisible(playerPed, true) + SetEntityVisible(PlayerPedId(), true, true) IsInShopMenu = false end, function(data, menu) diff --git a/server-data/resources/[bpt_addons]/bpt_policejob/client/vehicle.lua b/server-data/resources/[bpt_addons]/bpt_policejob/client/vehicle.lua index 8033a3e26..c3502ae8d 100644 --- a/server-data/resources/[bpt_addons]/bpt_policejob/client/vehicle.lua +++ b/server-data/resources/[bpt_addons]/bpt_policejob/client/vehicle.lua @@ -236,7 +236,7 @@ function OpenShopMenu(elements, restoreCoords, shopCoords) DeleteSpawnedVehicles() FreezeEntityPosition(playerPed, false) - SetEntityVisible(playerPed, true) + SetEntityVisible(PlayerPedId(), true, true) ESX.Game.Teleport(playerPed, restoreCoords) elseif element3.value == "buy" then @@ -253,7 +253,7 @@ function OpenShopMenu(elements, restoreCoords, shopCoords) ESX.CloseContext() DeleteSpawnedVehicles() FreezeEntityPosition(playerPed, false) - SetEntityVisible(playerPed, true) + SetEntityVisible(PlayerPedId(), true, true) ESX.Game.Teleport(playerPed, restoreCoords) else @@ -268,7 +268,7 @@ function OpenShopMenu(elements, restoreCoords, shopCoords) DeleteSpawnedVehicles() FreezeEntityPosition(playerPed, false) - SetEntityVisible(playerPed, true) + SetEntityVisible(PlayerPedId(), true, true) ESX.Game.Teleport(playerPed, restoreCoords) end) diff --git a/server-data/resources/[esx]/esx_multicharacter/client/main.lua b/server-data/resources/[esx]/esx_multicharacter/client/main.lua index 5aa172654..612f2c67d 100644 --- a/server-data/resources/[esx]/esx_multicharacter/client/main.lua +++ b/server-data/resources/[esx]/esx_multicharacter/client/main.lua @@ -56,7 +56,7 @@ if ESX.GetConfig().Multichar then for i = 1, #keys do EnableControlAction(0, keys[i], true) end - SetEntityVisible(PlayerPedId(), 0, 0) + SetEntityVisible(PlayerPedId(), true, true) SetLocalPlayerVisibleLocally(1) SetPlayerInvincible(PlayerId(), 1) ThefeedHideThisFrame() @@ -72,7 +72,7 @@ if ESX.GetConfig().Multichar then end local playerId, playerPed = PlayerId(), PlayerPedId() MumbleSetVolumeOverride(playerId, -1.0) - SetEntityVisible(playerPed, 1, 0) + SetEntityVisible(PlayerPedId(), true, true) SetPlayerInvincible(playerId, 0) FreezeEntityPosition(playerPed, false) Wait(10000) diff --git a/server-data/resources/[esx_addons]/esx_property/client/cctv.lua b/server-data/resources/[esx_addons]/esx_property/client/cctv.lua index 9a3003396..1680de982 100644 --- a/server-data/resources/[esx_addons]/esx_property/client/cctv.lua +++ b/server-data/resources/[esx_addons]/esx_property/client/cctv.lua @@ -92,7 +92,7 @@ function CCTV(PropertyID) FreezeEntityPosition(playerPed, true) SetEntityCollision(playerPed, false, true) local ShowButtons = true - SetEntityVisible(playerPed, false) + SetEntityVisible(PlayerPedId(), true, true) SetTimecycleModifierStrength(2.0) SetFocusArea(Property.Entrance.x, Property.Entrance.y, Property.Entrance.z, 0.0, 0.0, 0.0) PointCamAtCoord(cctvcam, vector3(Property.Entrance.x, Property.Entrance.y, Property.Entrance.z + Config.CCTV.HeightAboveDoor)) @@ -246,7 +246,7 @@ function CCTV(PropertyID) SetSeethrough(false) SetEntityCollision(playerPed, true, true) FreezeEntityPosition(playerPed, false) - SetEntityVisible(playerPed, true) + SetEntityVisible(PlayerPedId(), true, true) Wait(1500) DoScreenFadeIn(1000) end diff --git a/server-data/resources/[esx_addons]/esx_vehicleshop/client/main.lua b/server-data/resources/[esx_addons]/esx_vehicleshop/client/main.lua index 846745e87..a5ba64e9b 100644 --- a/server-data/resources/[esx_addons]/esx_vehicleshop/client/main.lua +++ b/server-data/resources/[esx_addons]/esx_vehicleshop/client/main.lua @@ -2,7 +2,7 @@ local HasAlreadyEnteredMarker, IsInShopMenu = false, false local CurrentAction, CurrentActionMsg, LastZone, currentDisplayVehicle, CurrentVehicleData local CurrentActionData, Vehicles, Categories = {}, {}, {} -function getVehicleFromModel(model) +function GetVehicleFromModel(model) for i = 1, #Vehicles do local vehicle = Vehicles[i] if vehicle.model == model then @@ -11,7 +11,7 @@ function getVehicleFromModel(model) end end -function getVehicles() +function GetVehicles() ESX.TriggerServerCallback("esx_vehicleshop:getCategories", function(categories) Categories = categories end) @@ -21,7 +21,7 @@ function getVehicles() end) end -AddEventHandler("onResourceStart", getVehicles) +AddEventHandler("onResourceStart", GetVehicles) function PlayerManagement() if not Config.EnablePlayerManagement then @@ -59,7 +59,7 @@ end) RegisterNetEvent("esx:setJob") AddEventHandler("esx:setJob", function() PlayerManagement() - getVehicles() + GetVehicles() end) function DeleteDisplayVehicleInsideShop() @@ -84,7 +84,7 @@ function ReturnVehicleProvider() for _, v in ipairs(vehicles) do local returnPrice = ESX.Math.Round(v.price * 0.75) - local vehicleLabel = getVehicleFromModel(v.vehicle).name + local vehicleLabel = GetVehicleFromModel(v.vehicle).name table.insert(elements, { label = ('%s [%s]'):format(vehicleLabel, TranslateCap("generic_shopitem", ESX.Math.GroupDigits(returnPrice))), @@ -133,7 +133,7 @@ function OpenShopMenu() local playerPed = PlayerPedId() FreezeEntityPosition(playerPed, true) - SetEntityVisible(playerPed, false) + SetEntityVisible(PlayerPedId(), true, true) SetEntityCoords(playerPed, Config.Zones.ShopInside.Pos) local vehiclesByCategory = {} @@ -213,7 +213,7 @@ function OpenShopMenu() local playerPed = PlayerPedId() FreezeEntityPosition(playerPed, false) - SetEntityVisible(playerPed, true) + SetEntityVisible(PlayerPedId(), true, true) SetEntityCoords(playerPed, Config.Zones.ShopEntering.Pos) menu2.close() @@ -233,7 +233,7 @@ function OpenShopMenu() menu.close() DeleteDisplayVehicleInsideShop() FreezeEntityPosition(playerPed, false) - SetEntityVisible(playerPed, true) + SetEntityVisible(PlayerPedId(), true, true) else ESX.ShowNotification(TranslateCap("not_enough_money")) end @@ -255,7 +255,7 @@ function OpenShopMenu() CurrentActionData = {} FreezeEntityPosition(playerPed, false) - SetEntityVisible(playerPed, true) + SetEntityVisible(PlayerPedId(), true, true) SetEntityCoords(playerPed, Config.Zones.ShopEntering.Pos) IsInShopMenu = false @@ -439,7 +439,7 @@ function OpenPopVehicleMenu() local elements = {} for _, v in ipairs(vehicles) do - local vehicleLabel = getVehicleFromModel(v.vehicle).name + local vehicleLabel = GetVehicleFromModel(v.vehicle).name table.insert(elements, { label = ('%s [MSRP %s]'):format(vehicleLabel, TranslateCap("generic_shopitem", ESX.Math.GroupDigits(v.price))), @@ -476,7 +476,7 @@ function OpenRentedVehiclesMenu() local elements = {} for _, v in ipairs(vehicles) do - local vehicleLabel = getVehicleFromModel(v.name).label + local vehicleLabel = GetVehicleFromModel(v.name).label table.insert(elements, { label = ('%s: %s - %s'):format(v.playerName, vehicleLabel, v.plate), @@ -724,7 +724,7 @@ AddEventHandler("onResourceStop", function(resource) local playerPed = PlayerPedId() FreezeEntityPosition(playerPed, false) - SetEntityVisible(playerPed, true) + SetEntityVisible(PlayerPedId(), true, true) SetEntityCoords(playerPed, Config.Zones.ShopEntering.Pos) end @@ -732,19 +732,6 @@ AddEventHandler("onResourceStop", function(resource) end end) -if Config.EnablePlayerManagement then - RegisterNetEvent("esx_phone:loaded") - AddEventHandler("esx_phone:loaded", function(phoneNumber, contacts) - local specialContact = { - name = TranslateCap("dealership"), - number = "cardealer", - base64Icon = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAMAAABrrFhUAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAMAUExURQAAADMzMzszM0M0M0w0M1Q1M101M2U2M242M3Y3M383Moc4MpA4Mpg5MqE5Mqk6MrI6Mro7Mrw8Mr89M71DML5EO8I+NMU/NcBMLshANctBNs5CN8RULMddKsheKs9YLtBCONZEOdlFOtxGO99HPNhMNsplKM1nKM1uJtRhLddiLt5kMNJwJ9B2JNR/IeNIPeVJPehKPuRQOuhSO+lZOOlhNuloM+p3Lep/KupwMMFORsVYUcplXc1waNJ7delUSepgVexrYe12bdeHH9iIH9qQHd2YG+udH+OEJeuGJ+uOJeuVIuChGeSpF+aqGOykHOysGeeyFeuzFuyzFuq6E+27FO+Cee3CEdaGgdqTjvCNhfKYkvOkngAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJezdycAAAEAdFJOU////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////wBT9wclAAAACXBIWXMAAA7DAAAOwwHHb6hkAAAAGHRFWHRTb2Z0d2FyZQBwYWludC5uZXQgNC4xLjb9TgnoAAAQGElEQVR4Xt2d+WMUtxXHbS6bEGMPMcQQ04aEUnqYo9xJWvC6kAKmQLM2rdn//9+g0uir2Tl0PElPszP7+cnH7Fj6rPTeG2lmvfKld2azk8lk/36L/cnkZDbDIT3Sp4DZ8QS9dTI57tNDTwJOOu+4j/0TvDQz+QXMSG+7mUn+sZBZQELnNROcKhMZBXx+gS4k8+IzTpmBXAJOnqPxTDzPFRKyCODuvSKPgwwC2EZ+lxf4E4xwCzhBU7PBPQx4BWR88+fwDgNGAbMsM9/Ec8bygE3A5966L3nOlhiZBGSf+l2YggGLgBna1DMsE4FBQH9zvw1HLEgX0Evkt5GeEVIFMFztpJF6rZQm4DNasVDSEkKSgIVN/ibP0ZwoEgQsfPTPSZgH8QIG8vYr4gdBrIABvf2K2EEQKWBQb78ichBECRhE8O8SlQ5iBAQvcffFPhoYQoSAAQ5/TcQ0CBYw0OGvCZ4GoQIGF/3bhGaDQAELvfKhERgIwgQMePrPCQsEQQLwFwYPmksiQMCC1n1iCFgooQtYwLJfPPQFQ7KAUfU/wABVwMj6TzdAFDDY6tcOMR3SBIyw/1QDJAGj7D/RAEXA6Oa/hhIHCAJG23+SAb+AEfefYsArYET1nwlvTegVgBONFnTDik8ATjNi0BEbHgGjuP5147k6dgsYaQHQxF0OOAUMfv2LhnOVzCVg4OufdFwrpS4BePkSgA6ZcAhYggCocQRCu4ClCIAaeyC0CliaAKCwhgGrALxwaUC3OtgELFEAUNjCgEXAklQAdSzVgEUAXrRUoGstzAKWbgJIzJPAKGAJJ4DEOAmMAvCCpQPda2ASsJQTQGKa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", - } - - TriggerEvent("esx_phone:addSpecialContact", specialContact.name, specialContact.number, specialContact.base64Icon) - end) -end - -- Create Blips CreateThread(function() if Config.Blip.show then @@ -866,4 +853,4 @@ end) if ESX.PlayerLoaded then PlayerManagement() end -getVehicles() +GetVehicles() diff --git a/server-data/resources/[esx_addons]/esx_vehicleshop/server/main.lua b/server-data/resources/[esx_addons]/esx_vehicleshop/server/main.lua index 9fba37f77..ff8bc6ab8 100644 --- a/server-data/resources/[esx_addons]/esx_vehicleshop/server/main.lua +++ b/server-data/resources/[esx_addons]/esx_vehicleshop/server/main.lua @@ -1,6 +1,5 @@ local categories, vehicles = {}, {} -TriggerEvent("esx_phone:registerNumber", "cardealer", TranslateCap("dealer_customers"), false, false) TriggerEvent("bpt_society:registerSociety", "cardealer", TranslateCap("car_dealer"), "society_cardealer", "society_cardealer", "society_cardealer", { type = "private", }) @@ -32,7 +31,7 @@ function SQLVehiclesAndCategories() vehicles = MySQL.query.await("SELECT vehicles.*, vehicle_categories.label AS categoryLabel FROM vehicles JOIN vehicle_categories ON vehicles.category = vehicle_categories.name") end -function getVehicleFromModel(model) +function GetVehicleFromModel(model) for i = 1, #vehicles do local vehicle = vehicles[i] if vehicle.model == model then @@ -148,7 +147,7 @@ end) ESX.RegisterServerCallback("esx_vehicleshop:buyVehicle", function(source, cb, model, plate) local xPlayer = ESX.GetPlayerFromId(source) - local modelPrice = getVehicleFromModel(model).price + local modelPrice = GetVehicleFromModel(model).price if modelPrice and xPlayer.getMoney() >= modelPrice then xPlayer.removeMoney(modelPrice, "Vehicle Purchase") @@ -178,7 +177,7 @@ ESX.RegisterServerCallback("esx_vehicleshop:buyCarDealerVehicle", function(sourc local xPlayer = ESX.GetPlayerFromId(source) if xPlayer.job.name == "cardealer" then - local modelPrice = getVehicleFromModel(model).price + local modelPrice = GetVehicleFromModel(model).price if modelPrice then TriggerEvent("bpt_addonaccount:getSharedAccount", "society_cardealer", function(account) @@ -209,7 +208,7 @@ AddEventHandler("esx_vehicleshop:returnProvider", function(vehicleModel) if rowsChanged == 1 then TriggerEvent("bpt_addonaccount:getSharedAccount", "society_cardealer", function(account) local price = ESX.Math.Round(result.price * 0.75) - local vehicleLabel = getVehicleFromModel(vehicleModel).name + local vehicleLabel = GetVehicleFromModel(vehicleModel).name account.addMoney(price) xPlayer.showNotification(TranslateCap("vehicle_sold_for", vehicleLabel, ESX.Math.GroupDigits(price)))