From 76e04fb9c32df4deac92d12fe9e06618d2ad989d Mon Sep 17 00:00:00 2001
From: Matias Salas <42161973+Dislaik@users.noreply.github.com>
Date: Mon, 20 Jul 2020 10:03:43 -0400
Subject: [PATCH] Fixed getItem, item_weapon (#112)

The player not able to withdraw weapons
---
 server/main.lua | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/server/main.lua b/server/main.lua
index c8cd8cff..97ba7e23 100644
--- a/server/main.lua
+++ b/server/main.lua
@@ -252,16 +252,21 @@ AddEventHandler('esx_property:getItem', function(owner, type, item, count)
 	elseif type == 'item_weapon' then
 		TriggerEvent('esx_datastore:getDataStore', 'property', xPlayerOwner.identifier, function(store)
 			local storeWeapons = store.get('weapons') or {}
-			local weapon = storeWeapons[data.current.count] -- count is the index
+			local weaponName   = nil
+			local ammo         = nil
 
-			if weapon then
-				if not xPlayer.hasWeapon(weaponName) then
-					table.remove(storeWeapons, data.current.count)
-					store.set('weapons', storeWeapons)
+			for i=1, #storeWeapons, 1 do
+				if storeWeapons[i].name == item then
+					weaponName = storeWeapons[i].name
+					ammo       = storeWeapons[i].ammo
 
-					xPlayer.addWeapon(weapon.name, weapon.ammo)
+					table.remove(storeWeapons, i)
+					break
 				end
 			end
+
+			store.set('weapons', storeWeapons)
+			xPlayer.addWeapon(weaponName, ammo)
 		end)
 	end
 end)