Merge branch 'main' into main

qbcore-framework · Jul 15, 2024 · 12ed68e · 12ed68e
2 parents 7996078 + 00a092e
commit 12ed68e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/html/index.html b/html/index.html
@@ -191,7 +191,7 @@
                 </div>
             </div>
             <ul v-if="showContextMenu" class="context-menu" :style="{ top: contextMenuPosition.top, left: contextMenuPosition.left }">
-                <li @click="useItem(contextMenuItem)">Use</li>
+                <li v-if="contextMenuItem.useable" @click="useItem(contextMenuItem)">Use</li>
                 <li @mouseover="showSubmenu = true" @mouseleave="showSubmenu = false">
                     Give
                     <ul v-if="showSubmenu" class="submenu">

diff --git a/server/main.lua b/server/main.lua
@@ -174,15 +174,16 @@ RegisterNetEvent('qb-inventory:server:closeInventory', function(inventory)
 end)
 
 RegisterNetEvent('qb-inventory:server:useItem', function(item)
-    local itemData = GetItemBySlot(source, item.slot)
+    local src = source
+    local itemData = GetItemBySlot(src, item.slot)
     if not itemData then return end
     local itemInfo = QBCore.Shared.Items[itemData.name]
     if itemData.type == 'weapon' then
-        TriggerClientEvent('qb-weapons:client:UseWeapon', source, itemData, itemData.info.quality and itemData.info.quality > 0)
-        TriggerClientEvent('qb-inventory:client:ItemBox', source, itemInfo, 'use')
+        TriggerClientEvent('qb-weapons:client:UseWeapon', src, itemData, itemData.info.quality and itemData.info.quality > 0)
+        TriggerClientEvent('qb-inventory:client:ItemBox', src, itemInfo, 'use')
     else
-        UseItem(itemData.name, source, itemData)
-        TriggerClientEvent('qb-inventory:client:ItemBox', source, itemInfo, 'use')
+        UseItem(itemData.name, src, itemData)
+        TriggerClientEvent('qb-inventory:client:ItemBox', src, itemInfo, 'use')
     end
 end)