fix: qb job, IsDead check, capitalize addoption & removeoption

baguscodestudio · Sep 6, 2024 · 7b20ec8 · 7b20ec8
1 parent 7ed70a8
commit 7b20ec8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/client/framework/esx.lua b/client/framework/esx.lua
@@ -11,10 +11,10 @@ CreateThread(function()
     RegisterNetEvent('esx:setJob')
     AddEventHandler('esx:setJob', function(job)
         PlayerData.job = job
-        exports.bcs_radialmenu:removeOption('job_menu')
+        exports.bcs_radialmenu:RemoveOption('job_menu')
         for key, values in pairs(Config.JobMenu) do
             if job.name == key then
-                exports.bcs_radialmenu:addOption({
+                exports.bcs_radialmenu:AddOption({
                     id = 'job_menu',
                     label = 'Job Menu',
                     icon = 'fa-solid fa-suitcase',
@@ -30,7 +30,7 @@ CreateThread(function()
         if PlayerData and PlayerData.job then
             for job, values in pairs(Config.JobMenu) do
                 if job == PlayerData.job.name then
-                    exports.bcs_radialmenu:addOption({
+                    exports.bcs_radialmenu:AddOption({
                         id = 'job_menu',
                         label = 'Job Menu',
                         icon = 'fa-solid fa-suitcase',

diff --git a/client/framework/qb.lua b/client/framework/qb.lua
@@ -6,10 +6,10 @@ CreateThread(function()
 
     RegisterNetEvent('QBCore:Player:SetPlayerData', function(val)
         PlayerData = val
-        exports.bcs_radialmenu:removeOption('job_menu')
+        exports.bcs_radialmenu:RemoveOption('job_menu')
         for key, values in pairs(Config.JobMenu) do
-            if job.name == key then
-                exports.bcs_radialmenu:addOption({
+            if PlayerData.job.name == key then
+                exports.bcs_radialmenu:AddOption({
                     id = 'job_menu',
                     label = 'Job Menu',
                     icon = 'fa-solid fa-suitcase',
@@ -25,7 +25,7 @@ CreateThread(function()
         if PlayerData and PlayerData.job then
             for job, values in pairs(Config.JobMenu) do
                 if job == PlayerData.job.name then
-                    exports.bcs_radialmenu:addOption({
+                    exports.bcs_radialmenu:AddOption({
                         id = 'job_menu',
                         label = 'Job Menu',
                         icon = 'fa-solid fa-suitcase',

diff --git a/client/main.lua b/client/main.lua
@@ -16,7 +16,7 @@ CreateThread(function()
   if PlayerData and PlayerData.job then
     for job, values in pairs(Config.JobMenu) do
       if job == PlayerData.job.name then
-        exports.bcs_radialmenu:addOption({
+        exports.bcs_radialmenu:AddOption({
           id = 'job_menu',
           label = 'Job Menu',
           icon = 'fa-solid fa-suitcase',
@@ -31,7 +31,7 @@ end)
 local open = false
 
 RegisterCommand('+' .. Config.Open.command, function()
-  local dead = lib.callback.await('bcs_jobs:ambulance:server:CheckPlayer', false, GetPlayerServerId(PlayerId()))
+  local dead = IsDead()
   if not dead then
     SetNuiFocusKeepInput(true)
     ToggleNuiFrame(true)
@@ -60,9 +60,9 @@ exports('resetMenu', function()
   currentMenu = home
 end)
 
-exports('addOption', function(option, menu)
+exports('AddOption', function(option, menu)
   if additionalOptions[option.id] then
-    exports.bcs_radialmenu:removeOption(option.id)
+    exports.bcs_radialmenu:RemoveOption(option.id)
   end
   if menu and Menus[menu] then
     Menus[menu].options[#Menus[menu].options + 1] = option
@@ -72,7 +72,7 @@ exports('addOption', function(option, menu)
   additionalOptions[option.id] = true
 end)
 
-exports('removeOption', function(id, menu)
+exports('RemoveOption', function(id, menu)
   local function RemoveOption(options)
     for k, v in pairs(options) do
       if v.id and v.id == id then