Fixed PlayerStatus

qbcore-framework · May 23, 2024 · cdb9ce0 · cdb9ce0
1 parent f440fd1
commit cdb9ce0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/client/job.lua b/client/job.lua
@@ -354,7 +354,7 @@ RegisterNetEvent('police:client:CheckStatus', function()
                 QBCore.Functions.TriggerCallback('police:GetPlayerStatus', function(result)
                     if result then
                         for _, v in pairs(result) do
-                            QBCore.Functions.Notify('' .. v .. '')
+                            QBCore.Functions.Notify('Player comes back with ' .. v)
                         end
                     end
                 end, playerId)

diff --git a/locales/en.lua b/locales/en.lua
@@ -26,7 +26,8 @@ local Translations = {
         no_driver_license = 'No drivers license',
         not_cuffed_dead = 'Civilian isn\'t cuffed or dead',
         fine_yourself = 'You Cannot Fine Yourself',
-        not_online = 'This person is not online'
+        not_online = 'This person is not online',
+        no_status = 'No status found for the person',
     },
     success = {
         uncuffed = 'You have been uncuffed',
@@ -117,7 +118,7 @@ local Translations = {
         officer_down = 'Officer %{lastname} | %{callsign} Down',
         fine_issued = 'Fine has been issued to offender succesfully',
         received_fine = 'State Debt Recovery has automatically recovered the fines owed...',
-        camera_speed= 'Speed camera #%{radarid} - Marked vehicle'
+        camera_speed = 'Speed camera #%{radarid} - Marked vehicle'
 
     },
     evidence = {

diff --git a/server/main.lua b/server/main.lua
@@ -542,14 +542,16 @@ QBCore.Functions.CreateCallback('police:server:isPlayerDead', function(_, cb, pl
     cb(Player.PlayerData.metadata['isdead'])
 end)
 
-QBCore.Functions.CreateCallback('police:GetPlayerStatus', function(_, cb, playerId)
+QBCore.Functions.CreateCallback('police:GetPlayerStatus', function(source, cb, playerId)
     local Player = QBCore.Functions.GetPlayer(playerId)
     local statList = {}
     if Player then
         if PlayerStatus[Player.PlayerData.source] and next(PlayerStatus[Player.PlayerData.source]) then
             for k in pairs(PlayerStatus[Player.PlayerData.source]) do
                 statList[#statList + 1] = PlayerStatus[Player.PlayerData.source][k].text
             end
+        else
+            TriggerClientEvent('QBCore:Notify', source, Lang:t('error.no_status'), 'error')
         end
     end
     cb(statList)