From a4152db8c36588e5f594675f5572310d5aa046fc Mon Sep 17 00:00:00 2001
From: ElPumpo <samo_kol@hotmail.com>
Date: Sun, 11 Nov 2018 11:52:16 +0100
Subject: [PATCH] xPlayer.hasWeapon() function

---
 server/classes/player.lua | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/server/classes/player.lua b/server/classes/player.lua
index 03f29901..114cc66d 100644
--- a/server/classes/player.lua
+++ b/server/classes/player.lua
@@ -384,15 +384,7 @@ function CreateExtendedPlayer(player, accounts, inventory, job, loadout, name, l
 			end
 		end
 
-		local foundWeapon = false
-
-		for i=1, #self.loadout, 1 do
-			if self.loadout[i].name == weaponName then
-				foundWeapon = true
-			end
-		end
-
-		if not foundWeapon then
+		if not self.hasWeapon(weaponName) then
 			table.insert(self.loadout, {
 				name  = weaponName,
 				ammo  = ammo,
@@ -414,8 +406,6 @@ function CreateExtendedPlayer(player, accounts, inventory, job, loadout, name, l
 			end
 		end
 
-		local foundWeapon = false
-
 		for i=1, #self.loadout, 1 do
 			if self.loadout[i].name == weaponName then
 				table.remove(self.loadout, i)
@@ -427,5 +417,15 @@ function CreateExtendedPlayer(player, accounts, inventory, job, loadout, name, l
 		TriggerClientEvent('esx:removeInventoryItem', self.source, {label = weaponLabel}, 1)
 	end
 
+	self.hasWeapon = function(weaponName)
+		for i=1, #self.loadout, 1 do
+			if self.loadout[i].name == weaponName then
+				return true
+			end
+		end
+
+		return false
+	end
+
 	return self
 end