From 89b0549090c0fc9a8458dc6029329440dac9ce8a Mon Sep 17 00:00:00 2001 From: jimathy Date: Wed, 4 May 2022 20:44:57 +0100 Subject: [PATCH] Fix Bossmeny support for banking --- atms.lua | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/atms.lua b/atms.lua index d3d4097..9ccb1d1 100644 --- a/atms.lua +++ b/atms.lua @@ -132,7 +132,7 @@ CreateThread(function() if Config.Peds then local i = math.random(1, #Config.PedPool) RequestModel(Config.PedPool[i]) while not HasModelLoaded(Config.PedPool[i]) do Wait(0) end - if Peds["jimbank"..k..l] == nil then Peds["jimbank"..k..l] = CreatePed(0, Config.PedPool[i], vector3(tonumber(b.x), tonumber(b.y), tonumber(b.z)-1), b[4], false, false) end + if Peds["jimbank"..k..l] == nil then Peds["jimbank"..k..l] = CreatePed(0, Config.PedPool[i], vector3(tonumber(b.x), tonumber(b.y), tonumber(b.z)), b[4], false, false) end if Config.Debug then print("Ped Created - 'jimbank"..k..l.."'") end end end @@ -159,15 +159,21 @@ end RegisterNetEvent('jim-payments:Client:ATM:use', function(data) --this grabs all the info from names to savings account numbers in the databases - while name == nil do - QBCore.Functions.TriggerCallback('jim-payments:ATM:Find', function(cb1, cb2, cb3, cb4, cb5, cb6, cb7) name = cb1 cash = cb2 bank = cb3 account = cb4 cid = cb5 savbal = cb6 aid = cb7 end) + + while name == nil do + QBCore.Functions.TriggerCallback('jim-payments:ATM:Find', function(cb1, cb2, cb3, cb4, cb5, cb6, cb7) name = cb1 cash = cb2 bank = math.ceil(cb3) account = cb4 cid = cb5 savbal = cb6 aid = cb7 end) Citizen.Wait(100) end - - society = GrabAccount("GetAccount", PlayerJob.name) - Wait(200) - gsociety = GrabAccount("GetGangAccount", PlayerGang.name) - + if Config.Manage then + society = GrabAccount("GetAccount", PlayerJob.name) + Wait(200) + gsociety = GrabAccount("GetGangAccount", PlayerGang.name) + else + local p = promise.new() + QBCore.Functions.TriggerCallback('qb-bossmenu:server:GetAccount', function(cb) p:resolve(cb) end, PlayerJob.name) society = Citizen.Await(p) + local p2 = promise.new() + QBCore.Functions.TriggerCallback('qb-gangmenu:server:GetAccount', function(cb) p2:resolve(cb) end, PlayerGang.name) gsociety = Citizen.Await(p2) + end local atmbartime = 2500 local setoptions = {} @@ -335,4 +341,4 @@ AddEventHandler('onResourceStop', function(resource) for k, v in pairs(Targets) do exports['qb-target']:RemoveZone(k) end for k, v in pairs(Peds) do DeletePed(Peds[k]) end end -end) +end) \ No newline at end of file