From 6a174821f1d7cb52c168ccfc2923efa088c9e7fa Mon Sep 17 00:00:00 2001 From: renaiku Date: Mon, 30 Oct 2017 19:59:07 +0100 Subject: [PATCH] Essential 5.0 compatibility update --- server/commands.lua | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/server/commands.lua b/server/commands.lua index 755dea95..1341f0b2 100644 --- a/server/commands.lua +++ b/server/commands.lua @@ -1,9 +1,9 @@ TriggerEvent('es:addGroupCommand', 'tp', 'admin', function(source, args, user) TriggerClientEvent("esx:teleport", source, { - x = tonumber(args[2]), - y = tonumber(args[3]), - z = tonumber(args[4]) + x = tonumber(args[1]), + y = tonumber(args[2]), + z = tonumber(args[3]) }) end, function(source, args, user) @@ -11,38 +11,38 @@ end, function(source, args, user) end) TriggerEvent('es:addGroupCommand', 'setjob', 'jobmaster', function(source, args, user) - local xPlayer = ESX.GetPlayerFromId(args[2]) - xPlayer.setJob(args[3], tonumber(args[4])) + local xPlayer = ESX.GetPlayerFromId(args[1]) + xPlayer.setJob(args[2], tonumber(args[3])) end, function(source, args, user) TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "Insufficient Permissions.") end, {help = _U('setjob'), params = {{name = "id", help = _U('id_param')}, {name = "job", help = _U('setjob_param2')}, {name = "grade_id", help = _U('setjob_param3')}}}) TriggerEvent('es:addGroupCommand', 'loadipl', 'admin', function(source, args, user) - TriggerClientEvent('esx:loadIPL', -1, args[2]) + TriggerClientEvent('esx:loadIPL', -1, args[1]) end, function(source, args, user) TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "Insufficient Permissions.") end, {help = _U('load_ipl')}) TriggerEvent('es:addGroupCommand', 'unloadipl', 'admin', function(source, args, user) - TriggerClientEvent('esx:unloadIPL', -1, args[2]) + TriggerClientEvent('esx:unloadIPL', -1, args[1]) end, function(source, args, user) TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "Insufficient Permissions.") end, {help = _U('unload_ipl')}) TriggerEvent('es:addGroupCommand', 'playanim', 'admin', function(source, args, user) - TriggerClientEvent('esx:playAnim', -1, args[2], args[3]) + TriggerClientEvent('esx:playAnim', -1, args[1], args[3]) end, function(source, args, user) TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "Insufficient Permissions.") end, {help = _U('play_anim')}) TriggerEvent('es:addGroupCommand', 'playemote', 'admin', function(source, args, user) - TriggerClientEvent('esx:playEmote', -1, args[2]) + TriggerClientEvent('esx:playEmote', -1, args[1]) end, function(source, args, user) TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "Insufficient Permissions.") end, {help = _U('play_emote')}) TriggerEvent('es:addGroupCommand', 'car', 'admin', function(source, args, user) - TriggerClientEvent('esx:spawnVehicle', source, args[2]) + TriggerClientEvent('esx:spawnVehicle', source, args[1]) end, function(source, args, user) TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "Insufficient Permissions.") end, {help = _U('spawn_car'), params = {{name = "car", help = _U('spawn_car_param')}}}) @@ -55,13 +55,13 @@ end, {help = _U('delete_vehicle'), params = {{name = "car", help = _U('delete_ve TriggerEvent('es:addGroupCommand', 'spawnped', 'admin', function(source, args, user) - TriggerClientEvent('esx:spawnPed', source, args[2]) + TriggerClientEvent('esx:spawnPed', source, args[1]) end, function(source, args, user) TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "Insufficient Permissions.") end, {help = _U('spawn_ped'), params = {{name = "name", help = _U('spawn_ped_param')}}}) TriggerEvent('es:addGroupCommand', 'spawnobject', 'admin', function(source, args, user) - TriggerClientEvent('esx:spawnObject', source, args[2]) + TriggerClientEvent('esx:spawnObject', source, args[1]) end, function(source, args, user) TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "Insufficient Permissions.") end, {help = _U('spawn_object'), params = {{name = "name"}}}) @@ -69,8 +69,8 @@ end, {help = _U('spawn_object'), params = {{name = "name"}}}) TriggerEvent('es:addGroupCommand', 'givemoney', 'admin', function(source, args, user) local _source = source - local xPlayer = ESX.GetPlayerFromId(args[2]) - local amount = tonumber(args[3]) + local xPlayer = ESX.GetPlayerFromId(args[1]) + local amount = tonumber(args[2]) if amount ~= nil then xPlayer.addMoney(amount) @@ -85,9 +85,9 @@ end, {help = _U('givemoney'), params = {{name = "id", help = _U('id_param')}, {n TriggerEvent('es:addGroupCommand', 'giveaccountmoney', 'admin', function(source, args, user) local _source = source - local xPlayer = ESX.GetPlayerFromId(args[2]) - local account = args[3] - local amount = tonumber(args[4]) + local xPlayer = ESX.GetPlayerFromId(args[1]) + local account = args[2] + local amount = tonumber(args[3]) if amount ~= nil then if xPlayer.getAccount(account) ~= nil then @@ -106,9 +106,9 @@ end, {help = _U('giveaccountmoney'), params = {{name = "id", help = _U('id_param TriggerEvent('es:addGroupCommand', 'giveitem', 'admin', function(source, args, user) local _source = source - local xPlayer = ESX.GetPlayerFromId(args[2]) - local item = args[3] - local count = (args[4] == nil and 1 or tonumber(args[4])) + local xPlayer = ESX.GetPlayerFromId(args[1]) + local item = args[2] + local count = (args[3] == nil and 1 or tonumber(args[3])) if count ~= nil then if xPlayer.getInventoryItem(item) ~= nil then @@ -126,8 +126,8 @@ end, {help = _U('giveitem'), params = {{name = "id", help = _U('id_param')}, {na TriggerEvent('es:addGroupCommand', 'giveweapon', 'admin', function(source, args, user) - local xPlayer = ESX.GetPlayerFromId(args[2]) - local weaponName = string.upper(args[3]) + local xPlayer = ESX.GetPlayerFromId(args[1]) + local weaponName = string.upper(args[2]) xPlayer.addWeapon(weaponName, 1000)