From 694a423034735218c412119fca5fc25132fbb1d8 Mon Sep 17 00:00:00 2001 From: ZF <48424078+zf-development@users.noreply.github.com> Date: Fri, 18 Mar 2022 19:34:23 -0400 Subject: [PATCH] toggleDuty to setDuty - Default duty have been put to be true. - toggleDuty event have been changed to setDuty needing a boolean state. --- [esx]/es_extended/server/classes/player.lua | 2 +- [esx]/es_extended/server/main.lua | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[esx]/es_extended/server/classes/player.lua b/[esx]/es_extended/server/classes/player.lua index c3d973c7..fc92bda7 100644 --- a/[esx]/es_extended/server/classes/player.lua +++ b/[esx]/es_extended/server/classes/player.lua @@ -376,7 +376,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, self.job.grade_name = gradeObject.name self.job.grade_label = gradeObject.label self.job.grade_salary = gradeObject.salary - self.job.onduty = false + self.job.onduty = true if gradeObject.skin_male then self.job.skin_male = json.decode(gradeObject.skin_male) diff --git a/[esx]/es_extended/server/main.lua b/[esx]/es_extended/server/main.lua index e4da1b8d..9cc11513 100644 --- a/[esx]/es_extended/server/main.lua +++ b/[esx]/es_extended/server/main.lua @@ -602,15 +602,17 @@ AddEventHandler('txAdmin:events:scheduledRestart', function(eventData) end end) -RegisterNetEvent('esx:toggleDuty') -AddEventHandler('esx:toggleDuty', function() +RegisterNetEvent('esx:setDuty') +AddEventHandler('esx:setDuty', function(state) local xPlayer = ESX.GetPlayerFromId(source) - if xPlayer.job.onduty then + if xPlayer.job.onduty == state then return end + + if state then xPlayer.setDuty(false) xPlayer.triggerEvent('esx:showNotification', _U('stopped_duty')) else xPlayer.setDuty(true) xPlayer.triggerEvent('esx:showNotification', _U('started_duty')) end - TriggerClientEvent('esx:setJob', source, xPlayer.job) + TriggerClientEvent('esx:setJob', xPlayer.source, xPlayer.job) end) \ No newline at end of file