diff --git a/atms.lua b/atms.lua index f84b417..420dcb0 100644 --- a/atms.lua +++ b/atms.lua @@ -336,9 +336,7 @@ RegisterNetEvent('jim-payments:client:ATM:give', function() end) end) -AddEventHandler('onResourceStop', function(resource) - if resource == GetCurrentResourceName() then - 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 +AddEventHandler('onResourceStop', function(resource) if resource ~= GetCurrentResourceName() then return end + 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) \ No newline at end of file diff --git a/atmserver.lua b/atmserver.lua index 0981457..3d66f93 100644 --- a/atmserver.lua +++ b/atmserver.lua @@ -11,7 +11,6 @@ local function cv(amount) return formatted end - ---- BANK STUFF QBCore.Functions.CreateCallback('jim-payments:ManageWrapper', function(source, cb, type, account) local result = nil diff --git a/client.lua b/client.lua index 3bad2ae..ed779db 100644 --- a/client.lua +++ b/client.lua @@ -3,13 +3,15 @@ local QBCore = exports['qb-core']:GetCoreObject() PlayerJob = {} local onDuty = false local BankPed = {} -RegisterNetEvent('QBCore:Client:OnPlayerLoaded') AddEventHandler('QBCore:Client:OnPlayerLoaded', function() QBCore.Functions.GetPlayerData(function(PlayerData) PlayerJob = PlayerData.job PlayerGang = PlayerData.gang end) end) -RegisterNetEvent('QBCore:Client:OnJobUpdate') AddEventHandler('QBCore:Client:OnJobUpdate', function(JobInfo) PlayerJob = JobInfo onDuty = PlayerJob.onduty end) -RegisterNetEvent('QBCore:Client:SetDuty') AddEventHandler('QBCore:Client:SetDuty', function(duty) onDuty = duty end) -RegisterNetEvent('QBCore:Client:OnGangUpdate') AddEventHandler('QBCore:Client:OnGangUpdate', function(GangInfo) PlayerGang = GangInfo end) +RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function() QBCore.Functions.GetPlayerData(function(PlayerData) PlayerJob = PlayerData.job PlayerGang = PlayerData.gang end) end) +RegisterNetEvent('QBCore:Client:OnJobUpdate', function(JobInfo) PlayerJob = JobInfo onDuty = PlayerJob.onduty end) +RegisterNetEvent('QBCore:Client:SetDuty', function(duty) onDuty = duty end) +RegisterNetEvent('QBCore:Client:OnGangUpdate', function(GangInfo) PlayerGang = GangInfo end) --Keeps track of duty on script restarts -AddEventHandler('onResourceStart', function(resource) if GetCurrentResourceName() == resource then QBCore.Functions.GetPlayerData(function(PlayerData) PlayerJob = PlayerData.job PlayerGang = PlayerData.gang onDuty = PlayerJob.onduty end) end end) +AddEventHandler('onResourceStart', function(resource) if GetCurrentResourceName() ~= resource then return end + QBCore.Functions.GetPlayerData(function(PlayerData) PlayerJob = PlayerData.job PlayerGang = PlayerData.gang onDuty = PlayerJob.onduty end) +end) CreateThread(function() local jobroles = {} @@ -83,6 +85,6 @@ end) RegisterNetEvent('jim-payments:Tickets:Sell:yes', function() TriggerServerEvent('jim-payments:Tickets:Sell') end) RegisterNetEvent('jim-payments:Tickets:Sell:no', function() exports['qb-menu']:closeMenu() end) -AddEventHandler('onResourceStop', function(resource) - if resource == GetCurrentResourceName() then exports['qb-target']:RemoveZone("JimBank") DeletePed(BankPed[1]) end +AddEventHandler('onResourceStop', function(resource) if resource ~= GetCurrentResourceName() then return end + exports['qb-target']:RemoveZone("JimBank") DeletePed(BankPed[1]) end) \ No newline at end of file diff --git a/config.lua b/config.lua index 630a8a0..590f8ba 100644 --- a/config.lua +++ b/config.lua @@ -1,4 +1,4 @@ -print("Jim-Payments v2.4 - Payments Script by Jimathy") +print("Jim-Payments v2.5 - Payments Script by Jimathy") -- If you need support I now have a discord available, it helps me keep track of issues and give better support. @@ -8,7 +8,7 @@ Config = {} Config.Debug = false -Config.Manage = true -- "true" if using qb-management +Config.Manage = false -- "true" if using qb-management -- "false" if using qb-bossmenu Config.TicketSystem = true -- Enable this if you want to use the ticket system false @@ -34,7 +34,7 @@ Config.PedPool = { [14] = `U_F_M_CasinoShop_01`, } -Config.Gabz = false -- "true" to enable Gabz Banking locations +Config.Gabz = true -- "true" to enable Gabz Banking locations Config.useATM = true -- Enable this to use my ATM's Config.useBanks = true -- Enable this to use my banking stuff Config.BankBlips = true -- Enable this if you disabled qb-banking and need bank locations @@ -75,7 +75,7 @@ Config.Jobs = { Config.ATMModels = {"prop_atm_01", "prop_atm_02", "prop_atm_03", "prop_fleeca_atm" } Config.GabzATMLocations = { ---PACIFIC BANK 8 ATMS (GABZ) +--PACIFIC BANK 12 ATMS (GABZ) vector3(239.02, 212.37, 106.28), vector3(239.46, 213.6, 106.28), vector3(239.9, 214.82, 106.28), @@ -84,6 +84,10 @@ Config.GabzATMLocations = { vector3(241.86, 220.16, 106.28), vector3(242.3, 221.41, 106.28), vector3(242.76, 222.63, 106.28), + vector3(263.46, 203.86, 106.28), + vector3(263.96, 205.03, 106.28), + vector3(264.37, 206.28, 106.28), + vector3(264.77, 207.51, 106.28), } Config.VanATMLocations = { @@ -214,5 +218,5 @@ Config.GabzBankLocations = { vector4(263.71, 212.63, 106.28, 337.53), -- Pacficic Gabz 7+8 vector4(259.02, 214.32, 106.28, 337.82), -- Pacficic Gabz 9+10 vector4(254.27, 216.06, 106.28, 336.37), -- Pacficic Gabz 11+12 - } -} + }, +} \ No newline at end of file diff --git a/fxmanifest.lua b/fxmanifest.lua index db7af80..a0ed265 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -1,6 +1,6 @@ name "Jim-Payments" author "Jimathy" -version "v2.4" +version "v2.5" description "Payment Script By Jimathy" fx_version "cerulean" game "gta5" diff --git a/server.lua b/server.lua index 85333f3..b539f1b 100644 --- a/server.lua +++ b/server.lua @@ -6,8 +6,8 @@ local function cv(amount) return formatted end -AddEventHandler('onResourceStart', function(resource) - if GetCurrentResourceName() == resource then for k, v in pairs(Config.Jobs) do if not QBCore.Shared.Jobs[k] then print("Jim-Payments: Config.Jobs searched for job '"..k.."' and couldn't find it in the Shared") end end end +AddEventHandler('onResourceStart', function(resource) if GetCurrentResourceName() ~= resource then return end + for k, v in pairs(Config.Jobs) do if not QBCore.Shared.Jobs[k] then print("Jim-Payments: Config.Jobs searched for job '"..k.."' and couldn't find it in the Shared") end end end) QBCore.Commands.Add("cashregister", "Use mobile cash register", {}, false, function(source) TriggerClientEvent("jim-payments:client:Charge", source, {}, true) end)