From cd9383a56fd6e8e1e15745dd13a7ac2d01cb34a3 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Wed, 6 Mar 2019 22:50:43 +0100 Subject: [PATCH] Grade supposed to be number type --- client/main.lua | 2 +- server/classes/player.lua | 2 +- server/main.lua | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/main.lua b/client/main.lua index 6b8bf6f6..fbb010c0 100644 --- a/client/main.lua +++ b/client/main.lua @@ -481,7 +481,7 @@ Citizen.CreateThread(function() Citizen.Wait(0) - if IsControlJustReleased(0, Keys['F2']) and GetLastInputMethod(2) and not isDead and not ESX.UI.Menu.IsOpen('default', 'es_extended', 'inventory') then + if IsControlJustReleased(0, Keys['F2']) and IsInputDisabled(0) and not isDead and not ESX.UI.Menu.IsOpen('default', 'es_extended', 'inventory') then ESX.ShowInventory() end diff --git a/server/classes/player.lua b/server/classes/player.lua index 73f5bbb9..256b365c 100644 --- a/server/classes/player.lua +++ b/server/classes/player.lua @@ -358,7 +358,7 @@ function CreateExtendedPlayer(player, accounts, inventory, job, loadout, name, l self.job.name = jobObject.name self.job.label = jobObject.label - self.job.grade = grade + self.job.grade = tonumber(grade) self.job.grade_name = gradeObject.name self.job.grade_label = gradeObject.label self.job.grade_salary = gradeObject.salary diff --git a/server/main.lua b/server/main.lua index 48853eaf..4ac0b405 100644 --- a/server/main.lua +++ b/server/main.lua @@ -141,7 +141,7 @@ AddEventHandler('es:playerLoaded', function(source, _player) userData.job.name = jobObject.name userData.job.label = jobObject.label - userData.job.grade = grade + userData.job.grade = tonumber(grade) userData.job.grade_name = gradeObject.name userData.job.grade_label = gradeObject.label userData.job.grade_salary = gradeObject.salary @@ -168,7 +168,7 @@ AddEventHandler('es:playerLoaded', function(source, _player) userData.job.name = jobObject.name userData.job.label = jobObject.label - userData.job.grade = grade + userData.job.grade = tonumber(grade) userData.job.grade_name = gradeObject.name userData.job.grade_label = gradeObject.label userData.job.grade_salary = gradeObject.salary