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

Don't parse item object to client, added weapon component notifications (more see desc)

Browse Source 
- Removed xPlayer .displayBank()
- Fixed issues with giving weapon using commands
- Modified ESX.UI.ShowInventoryItemNotification() to take string instead of table
- Minor adjustments and variable renames
- Fixed lower case weapons not droppable
- Removed /disconnect command becasue fivem implemented their own
This commit is contained in:
ElPumpo
2020-01-20 14:33:24 +01:00
parent 17b19893c9
commit cd1ce6a849
5 changed files with 93 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/commands.lua
+11 -15
View File
@@ -129,6 +129,8 @@ TriggerEvent('es:addGroupCommand', 'giveweapon', 'admin', function(source, args,
local weaponName = args[2] or 'unknown'
if ESX.GetWeapon(weaponName) then
weaponName = string.upper(weaponName)
if xPlayer.hasWeapon(weaponName) then
TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Player already has that weapon.' } })
else
@@ -152,19 +154,19 @@ TriggerEvent('es:addGroupCommand', 'giveweaponcomponent', 'admin', function(sour
local xPlayer = ESX.GetPlayerFromId(args[1])
if xPlayer then
local weapon = args[2] or 'unknown'
local weaponName = args[2] or 'unknown'
if ESX.GetWeapon(weapon) then
weapon = string.upper(weapon)
if ESX.GetWeapon(weaponName) then
weaponName = string.upper(weaponName)
if xPlayer.hasWeapon(weapon) then
local component = ESX.GetWeaponComponent(weapon, args[3] or 'unknown')
if xPlayer.hasWeapon(weaponName) then
local component = ESX.GetWeaponComponent(weaponName, args[3] or 'unknown')
if component then
if xPlayer.hasWeaponComponent(weapon, args[3]) then
if xPlayer.hasWeaponComponent(weaponName, args[3]) then
TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Player already has that weapon component.' } })
else
xPlayer.addWeaponComponent(weapon, args[3])
xPlayer.addWeaponComponent(weaponName, args[3])
end
else
TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Invalid weapon component.' } })
@@ -182,20 +184,14 @@ end, function(source, args, user)
TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficient Permissions.' } })
end, {help = 'Give weapon component', params = {
{name = 'playerId', help = _U('id_param')},
{name = 'weapon', help = _U('weapon')},
{name = 'component', help = 'weapon component'}
{name = 'weaponName', help = _U('weapon')},
{name = 'componentName', help = 'weapon component'}
}})
TriggerEvent('es:addGroupCommand', 'disc', 'admin', function(source, args, user)
DropPlayer(source, 'You have been disconnected')
end, function(source, args, user)
TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficient Permissions.' } })
end)
TriggerEvent('es:addGroupCommand', 'disconnect', 'admin', function(source, args, user)
DropPlayer(source, 'You have been disconnected')
end, function(source, args, user)
TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficient Permissions.' } })
end, {help = _U('disconnect')})
TriggerEvent('es:addGroupCommand', 'clear', 'user', function(source, args, user)