Merge pull request #557 from Sanriku-Gaming/patch-1

fix checkWeapon function
qbcore-framework · Jul 28, 2024 · f09850e · f09850e
2 parents 118126b + f70da43
commit f09850e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/server/main.lua b/server/main.lua
@@ -124,11 +124,13 @@ end)
 -- Functions
 
 local function checkWeapon(source, item)
+    local currentWeapon = type(item) == 'table' and item.name or item
     local ped = GetPlayerPed(source)
     local weapon = GetSelectedPedWeapon(ped)
     local weaponInfo = QBCore.Shared.Weapons[weapon]
-    if weaponInfo and weaponInfo.name == item.name then
+    if weaponInfo and weaponInfo.name == currentWeapon then
         RemoveWeaponFromPed(ped, weapon)
+        TriggerClientEvent('qb-weapons:client:UseWeapon', source, { name = currentWeapon }, false)
     end
 end