From a2ca81d6ff5d765cdc50ce3196b0b2cd801a6035 Mon Sep 17 00:00:00 2001
From: btwlouis <56355239+btwlouis@users.noreply.github.com>
Date: Mon, 10 Jul 2023 19:07:52 +0200
Subject: [PATCH] fix(rpc): .removeWeapon function use rpc natives

---
 [core]/es_extended/server/classes/player.lua | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua
index 52b72225..ae515d7b 100644
--- a/[core]/es_extended/server/classes/player.lua
+++ b/[core]/es_extended/server/classes/player.lua
@@ -470,13 +470,17 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
 					self.removeWeaponComponent(weaponName, v2)
 				end
 
+				local weaponHash = joaat(weaponName)
+				
+				RemoveWeaponFromPed(GetPlayerPed(self.source), weaponHash)
+				SetPedAmmo(GetPlayerPed(self.source), weaponHash, 0)
+
 				table.remove(self.loadout, k)
 				break
 			end
 		end
 
 		if weaponLabel then
-			self.triggerEvent('esx:removeWeapon', weaponName)
 			self.triggerEvent('esx:removeInventoryItem', weaponLabel, false, true)
 		end
 	end