From 7e294b55faeeb2c77f3a01b2aad1b7e7e37c7716 Mon Sep 17 00:00:00 2001 From: MrNewb <47620135+MrNewb@users.noreply.github.com> Date: Sun, 12 Jan 2025 12:55:29 -0500 Subject: [PATCH] Duty Toggles Needs Tested --- modules/framework/es_extended/server.lua | 9 ++++++++- modules/framework/qb-core/server.lua | 6 ++++++ modules/framework/qbx_core/server.lua | 5 +++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua index 67e3ea5..e9256d4 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -151,7 +151,14 @@ end Framework.SetPlayerJob = function(src, name, grade) local xPlayer = ESX.GetPlayerFromId(src) if not ESX.DoesJobExist(name, grade) then lib.print.error("Job Does Not Exsist In Framework :NAME "..name.." Grade:"..grade) return end - return xPlayer.setJob(name, grade) + return xPlayer.setJob(name, grade, true) +end + +Framework.ToggleDuty = function(src, status) + local xPlayer = ESX.GetPlayerFromId(src) + local name = xPlayer.getJob().name + local grade = xPlayer.getJob().grade + xPlayer.setJob(name, grade, status) end -- Framework.AddAccountBalance(src, _type, amount) diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index 202dd73..13e5144 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -182,6 +182,12 @@ Framework.SetPlayerJob = function(src, name, grade) return player.Functions.SetJob(name, grade) end +Framework.ToggleDuty = function(src, status) + local player = QBCore.Functions.GetPlayer(src) + player.Functions.SetJobDuty(status) + TriggerEvent('QBCore:Server:SetDuty', src, player.PlayerData.job.onduty) +end + -- Framework.AddAccountBalance(src, _type, amount) -- Adds the specified amount to the player's account balance of the specified type. Framework.AddAccountBalance = function(src, _type, amount) diff --git a/modules/framework/qbx_core/server.lua b/modules/framework/qbx_core/server.lua index 4742972..13592c1 100644 --- a/modules/framework/qbx_core/server.lua +++ b/modules/framework/qbx_core/server.lua @@ -181,6 +181,11 @@ Framework.SetPlayerJob = function(src, name, grade) return player.Functions.SetJob(name, grade) end +Framework.ToggleDuty = function(src, status) + local playerData = QBox:GetPlayer(src).PlayerData + QBox:SetJobDuty(playerData.citizenid, status) +end + -- Framework.AddAccountBalance(src, _type, amount) -- Adds the specified amount to the player's account balance of the specified type. Framework.AddAccountBalance = function(src, _type, amount)