starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-29 01:08:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1111 from btwlouis/remove-weapon-rpc

Browse Source 
Remove weapon using rpc
This commit is contained in:
Gellipapa
2023-07-10 21:46:26 +02:00
committed by GitHub
parent 6dcf536693 5c5b6be5a9
commit a2c1ef96d1
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[core]/es_extended/client/main.lua
+1 -3
View File
@@ -332,9 +332,7 @@ if not Config.OxInventory then
RegisterNetEvent('esx:removeWeapon')
AddEventHandler('esx:removeWeapon', function(weapon)
local playerPed = ESX.PlayerData.ped
RemoveWeaponFromPed(playerPed, joaat(weapon))
SetPedAmmo(ESX.PlayerData.ped, joaat(weapon), 0)
print("[^1ERROR^7] event ^5'esx:removeWeapon'^7 Has Been Removed. Please use ^5xPlayer.removeWeapon^7 Instead!")
end)
RegisterNetEvent('esx:removeWeaponComponent')
[core]/es_extended/server/classes/player.lua
+10 -2
View File
@@ -460,7 +460,11 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
end
function self.removeWeapon(weaponName)
local weaponLabel
local weaponLabel, playerPed = nil, GetPlayerPed(self.source)
if not playerPed then
return print("[^1ERROR^7] xPlayer.removeWeapon ^5invalid^7 player ped!")
end
for k, v in ipairs(self.loadout) do
if v.name == weaponName then
@@ -469,6 +473,11 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
for _, v2 in ipairs(v.components) do
self.removeWeaponComponent(weaponName, v2)
end
local weaponHash = joaat(v.name)
RemoveWeaponFromPed(playerPed, weaponHash)
SetPedAmmo(playerPed, weaponHash, 0)
table.remove(self.loadout, k)
break
@@ -476,7 +485,6 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory,
end
if weaponLabel then
self.triggerEvent('esx:removeWeapon', weaponName)
self.triggerEvent('esx:removeInventoryItem', weaponLabel, false, true)
end
end