From 1c0e73d6d9cf81051e8b861bb611c1142d669763 Mon Sep 17 00:00:00 2001 From: Lionh34rt <76415140+Lionh34rt@users.noreply.github.com> Date: Mon, 4 Apr 2022 14:23:43 +0200 Subject: [PATCH 1/5] PlayerData.job.isleo --- server/player.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/player.lua b/server/player.lua index 542cf15..5a84ee5 100644 --- a/server/player.lua +++ b/server/player.lua @@ -113,6 +113,7 @@ function QBCore.Player.CheckPlayerData(source, PlayerData) PlayerData.job.name = PlayerData.job.name or 'unemployed' PlayerData.job.label = PlayerData.job.label or 'Civilian' PlayerData.job.payment = PlayerData.job.payment or 10 + PlayerData.job.isleo = PlayerData.job.isleo or false if QBCore.Shared.ForceJobDefaultDutyAtLogin or PlayerData.job.onduty == nil then PlayerData.job.onduty = QBCore.Shared.Jobs[PlayerData.job.name].defaultDuty end @@ -167,6 +168,7 @@ function QBCore.Player.CreatePlayer(PlayerData) self.PlayerData.job.name = job self.PlayerData.job.label = QBCore.Shared.Jobs[job].label self.PlayerData.job.onduty = QBCore.Shared.Jobs[job].defaultDuty + self.PlayerData.job.isleo = QBCore.Shared.Jobs[job].isleo or false if QBCore.Shared.Jobs[job].grades[grade] then local jobgrade = QBCore.Shared.Jobs[job].grades[grade] self.PlayerData.job.grade = {} From c8c406df9f7204cf34c1596907e0eaf1482bd690 Mon Sep 17 00:00:00 2001 From: Lionh34rt <76415140+Lionh34rt@users.noreply.github.com> Date: Mon, 4 Apr 2022 14:24:18 +0200 Subject: [PATCH 2/5] PlayerData.job.isleo --- shared/jobs.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shared/jobs.lua b/shared/jobs.lua index 8960e67..bbe8922 100644 --- a/shared/jobs.lua +++ b/shared/jobs.lua @@ -14,6 +14,7 @@ QBShared.Jobs = { }, ['police'] = { label = 'Law Enforcement', + isleo = true, defaultDuty = true, offDutyPay = false, grades = { @@ -279,4 +280,4 @@ QBShared.Jobs = { }, }, }, -} \ No newline at end of file +} From 56473b484365e5be313294c34ce2611b83c64675 Mon Sep 17 00:00:00 2001 From: Lionh34rt <76415140+Lionh34rt@users.noreply.github.com> Date: Fri, 22 Apr 2022 22:24:11 +0200 Subject: [PATCH 3/5] Update server/player.lua Co-authored-by: ItsANoBrainer --- server/player.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/player.lua b/server/player.lua index 5a84ee5..39932e2 100644 --- a/server/player.lua +++ b/server/player.lua @@ -113,7 +113,7 @@ function QBCore.Player.CheckPlayerData(source, PlayerData) PlayerData.job.name = PlayerData.job.name or 'unemployed' PlayerData.job.label = PlayerData.job.label or 'Civilian' PlayerData.job.payment = PlayerData.job.payment or 10 - PlayerData.job.isleo = PlayerData.job.isleo or false + PlayerData.job.type = PlayerData.job.type or 'none' if QBCore.Shared.ForceJobDefaultDutyAtLogin or PlayerData.job.onduty == nil then PlayerData.job.onduty = QBCore.Shared.Jobs[PlayerData.job.name].defaultDuty end From 43b107fd4ccf122b6920410039d0513efd7a3166 Mon Sep 17 00:00:00 2001 From: Lionh34rt <76415140+Lionh34rt@users.noreply.github.com> Date: Fri, 22 Apr 2022 22:24:15 +0200 Subject: [PATCH 4/5] Update server/player.lua Co-authored-by: ItsANoBrainer --- server/player.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/player.lua b/server/player.lua index 39932e2..bbf0751 100644 --- a/server/player.lua +++ b/server/player.lua @@ -168,7 +168,7 @@ function QBCore.Player.CreatePlayer(PlayerData) self.PlayerData.job.name = job self.PlayerData.job.label = QBCore.Shared.Jobs[job].label self.PlayerData.job.onduty = QBCore.Shared.Jobs[job].defaultDuty - self.PlayerData.job.isleo = QBCore.Shared.Jobs[job].isleo or false + self.PlayerData.job.type = QBCore.Shared.Jobs[job].type or 'none' if QBCore.Shared.Jobs[job].grades[grade] then local jobgrade = QBCore.Shared.Jobs[job].grades[grade] self.PlayerData.job.grade = {} From 8685a55f26d94948518ecafb393aa7af031a7b4a Mon Sep 17 00:00:00 2001 From: Lionh34rt <76415140+Lionh34rt@users.noreply.github.com> Date: Fri, 22 Apr 2022 22:24:20 +0200 Subject: [PATCH 5/5] Update shared/jobs.lua Co-authored-by: ItsANoBrainer --- shared/jobs.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/jobs.lua b/shared/jobs.lua index bbe8922..a1da2bb 100644 --- a/shared/jobs.lua +++ b/shared/jobs.lua @@ -14,7 +14,7 @@ QBShared.Jobs = { }, ['police'] = { label = 'Law Enforcement', - isleo = true, + type = "leo", defaultDuty = true, offDutyPay = false, grades = {