Merge pull request #60 from Cocodrulo/refactor/hasitem

Refactor radio check function to simplify logic and use configuration…

Author: GhzGarage

client.lua

@@ -98,17 +98,8 @@ local function IsRadioOn()
     return onRadio
 end
 
-local function DoRadioCheck(PlayerItems)
-    local _hasRadio = false
-
-    for _, item in pairs(PlayerItems) do
-        if item.name == "radio" then
-            _hasRadio = true
-            break;
-        end
-    end
-
-    hasRadio = _hasRadio
+local function DoRadioCheck()
+    hasRadio = QBCore.Functions.HasItem(Config.RadioItem, 1)
 end
 
 --Exports
@@ -119,27 +110,27 @@ exports("IsRadioOn", IsRadioOn)
 -- Handles state right when the player selects their character and location.
 RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function()
     PlayerData = QBCore.Functions.GetPlayerData()
-    DoRadioCheck(PlayerData.items)
+    DoRadioCheck()
 end)
 
 -- Resets state on logout, in case of character change.
 RegisterNetEvent('QBCore:Client:OnPlayerUnload', function()
-    DoRadioCheck({})
+    DoRadioCheck()
     PlayerData = {}
     leaveradio()
 end)
 
 -- Handles state when PlayerData is changed. We're just looking for inventory updates.
 RegisterNetEvent('QBCore:Player:SetPlayerData', function(val)
     PlayerData = val
-    DoRadioCheck(PlayerData.items)
+    DoRadioCheck()
 end)
 
 -- Handles state if resource is restarted live.
 AddEventHandler('onResourceStart', function(resource)
     if GetCurrentResourceName() == resource then
         PlayerData = QBCore.Functions.GetPlayerData()
-        DoRadioCheck(PlayerData.items)
+        DoRadioCheck()
     end
 end)
 

config.lua

@@ -1,5 +1,7 @@
 Config = {}
 
+Config.RadioItem = 'radio'
+
 Config.RestrictedChannels = {
     [1] = {
         police = true,