fix(client): disarm weapon on inventory wipe

Resolves #1472.
overextended · Sep 12, 2023 · b0151a0 · b0151a0
1 parent c5742ac
commit b0151a0
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/client.lua b/client.lua
@@ -867,9 +867,13 @@ local function updateInventory(data, weight)
 			v.inventory = 'player'
 			local item = v.item
 
-			if currentWeapon?.slot == item?.slot and item.metadata then
-				currentWeapon.metadata = item.metadata
-				TriggerEvent('ox_inventory:currentWeapon', currentWeapon)
+			if currentWeapon?.slot == item?.slot then
+                if item.metadata then
+				    currentWeapon.metadata = item.metadata
+				    TriggerEvent('ox_inventory:currentWeapon', currentWeapon)
+                else
+                    currentWeapon = Weapon.Disarm(currentWeapon, true)
+                end
 			end
 
 			local curItem = PlayerData.inventory[item.slot]