From 2539e6fa9d454f559c52e9a719b319ccf7f32ac2 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Fri, 3 Jan 2020 12:49:07 +0100 Subject: [PATCH] Added missing exception handlers to commands, removed /setmoney command closes #206 --- locales/br.lua | 5 --- locales/cs.lua | 5 --- locales/de.lua | 5 --- locales/en.lua | 5 --- locales/fi.lua | 5 --- locales/fr.lua | 5 --- locales/pl.lua | 5 --- locales/sv.lua | 5 --- server/commands.lua | 92 ++++++++++++++++++++------------------------- 9 files changed, 40 insertions(+), 92 deletions(-) diff --git a/locales/br.lua b/locales/br.lua index e2c5b503..9f6c9c96 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -56,11 +56,6 @@ Locales['br'] = { ['spawn_car'] = 'spawn um carro', ['spawn_car_param'] = 'nome do carro', ['delete_vehicle'] = 'excluir Veiculo', - ['givemoney'] = 'dar dinheiro', - ['setmoney'] = 'set money for a player', - ['money_type'] = 'valid money types: cash, bank, black', - ['money_set'] = 'someone ~y~highly ranked~s~ just set ~g~$%s~s~ (%s) for you!', - ['money_amount'] = 'quantia de dinheiro', ['invalid_account'] = 'conta invalida', ['account'] = 'conta', ['giveaccountmoney'] = 'dar dinheiro da conta', diff --git a/locales/cs.lua b/locales/cs.lua index c1dc7c82..f0bd3966 100644 --- a/locales/cs.lua +++ b/locales/cs.lua @@ -56,11 +56,6 @@ Locales['cs'] = { ['spawn_car'] = 'spawn auto', ['spawn_car_param'] = 'název auta', ['delete_vehicle'] = 'odstranit vozidlo', - ['givemoney'] = 'dát peníze', - ['setmoney'] = 'nastavit peníze hráči', - ['money_type'] = 'platné typy peněz: cash, bank, black', - ['money_set'] = 'někdo s ~y~vysokou úrovní~s~ vám právě nastavil ~g~$%s~s~ (%s)!', - ['money_amount'] = 'množství peněz', ['invalid_account'] = 'neplatný účet', ['account'] = 'účet', ['giveaccountmoney'] = 'dát peníze na účet', diff --git a/locales/de.lua b/locales/de.lua index 3ba684dd..e0be6b73 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -56,11 +56,6 @@ Locales['de'] = { ['spawn_car'] = 'spawn a car', ['spawn_car_param'] = 'name of car', ['delete_vehicle'] = 'deletes Vehicle', - ['givemoney'] = 'give money', - ['setmoney'] = 'set money for a player', - ['money_type'] = 'valid money types: cash, bank, black', - ['money_set'] = 'someone ~y~highly ranked~s~ just set ~g~$%s~s~ (%s) for you!', - ['money_amount'] = 'amount of money', ['invalid_account'] = 'invalid account', ['account'] = 'account', ['giveaccountmoney'] = 'give account money', diff --git a/locales/en.lua b/locales/en.lua index d10db002..0001af22 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -56,11 +56,6 @@ Locales['en'] = { ['spawn_car'] = 'spawn a car', ['spawn_car_param'] = 'name of car', ['delete_vehicle'] = 'deletes Vehicle', - ['givemoney'] = 'give money', - ['setmoney'] = 'set money for a player', - ['money_type'] = 'valid money types: cash, bank, black', - ['money_set'] = 'someone ~y~highly ranked~s~ just set ~g~$%s~s~ (%s) for you!', - ['money_amount'] = 'amount of money', ['invalid_account'] = 'invalid account', ['account'] = 'account', ['giveaccountmoney'] = 'give account money', diff --git a/locales/fi.lua b/locales/fi.lua index 0898fde3..2105d3e2 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -56,11 +56,6 @@ Locales['fi'] = { ['spawn_car'] = 'spawnaa ajoneuvo', ['spawn_car_param'] = 'ajoneuvon nimi', ['delete_vehicle'] = 'poistaa ajoneuvon', - ['givemoney'] = 'anna rahaa', - ['setmoney'] = 'aseta pelaajan rahat', - ['money_type'] = 'hyväksytyt rahatyypit: cash, bank, black', - ['money_set'] = 'joku ~y~korkeesti rankattu~s~ asetti ~g~$%s~s~ (%s) sinulle!', - ['money_amount'] = 'rahan määrä', ['invalid_account'] = 'virheellinen tunnus', ['account'] = 'tunnus', ['giveaccountmoney'] = 'anna tilille rahaa', diff --git a/locales/fr.lua b/locales/fr.lua index 09266cfd..5dd22293 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -56,11 +56,6 @@ Locales['fr'] = { ['spawn_car'] = 'spawn un véhicule', ['spawn_car_param'] = 'nom de la voiture', ['delete_vehicle'] = 'supprimer le véhicule', - ['givemoney'] = 'donner de l\'argent', - ['setmoney'] = 'définir l\'argent pour un joueur', - ['money_type'] = 'types de monnaies valides: cash, bank, black', - ['money_set'] = 'quelqu\'un de ~y~haut placé~s~ vous a attribué ~g~$%s~s~ (%s) !', - ['money_amount'] = 'somme d\'argent', ['invalid_account'] = 'compte invalide', ['account'] = 'compte', ['giveaccountmoney'] = 'donner de l\'argent au compte', diff --git a/locales/pl.lua b/locales/pl.lua index a67dc75a..a8f22d78 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -56,11 +56,6 @@ Locales['pl'] = { ['spawn_car'] = 'sprowadź pojazd', ['spawn_car_param'] = 'nazwa samochodu', ['delete_vehicle'] = 'usuń pojazd', - ['givemoney'] = 'daj pieniądze', - ['setmoney'] = 'ustaw pieniądze dla gracza', - ['money_type'] = 'aktualne typy pieniędzy: cash, bank, black', - ['money_set'] = 'ktoś ~y~wysoko postawiony~s~ podarował Ci pieniądze i masz teraz ~g~%s$~s~ (%s)!', - ['money_amount'] = 'kwota pieniędzy', ['invalid_account'] = 'błędne konto', ['account'] = 'konto', ['giveaccountmoney'] = 'daj pieniądze na konto', diff --git a/locales/sv.lua b/locales/sv.lua index d0ab8171..6db1b5b7 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -56,11 +56,6 @@ Locales['sv'] = { ['spawn_car'] = 'spawna ett fordon', ['spawn_car_param'] = 'namn på fordon', ['delete_vehicle'] = 'ta bort fordon', - ['givemoney'] = 'ge pengar', - ['setmoney'] = 'bestäm mängd pengar till en valfri person', - ['money_type'] = 'giltiga typer: cash, bank, black', - ['money_set'] = 'någon ~y~högt uppsatt~s~ satte ~g~%s SEK~s~ (%s) för dig!', - ['money_amount'] = 'summa pengar', ['invalid_account'] = 'ogiltigt konto', ['account'] = 'konto', ['giveaccountmoney'] = 'ge spelarkonto pengar', diff --git a/server/commands.lua b/server/commands.lua index 32e8447f..81e485cb 100644 --- a/server/commands.lua +++ b/server/commands.lua @@ -58,82 +58,70 @@ end, {help = _U('delete_vehicle'), params = { {name = 'radius', help = 'Optional, delete every vehicle within the specified radius'} }}) -TriggerEvent('es:addGroupCommand', 'setmoney', 'admin', function(source, args, user) - local playerId = source - local target = tonumber(args[1]) - local money_type = args[2] - local money_amount = tonumber(args[3]) - - local xPlayer = ESX.GetPlayerFromId(target) - - if target and money_type and money_amount and xPlayer then - if money_type == 'cash' then - xPlayer.setMoney(money_amount) - elseif money_type == 'bank' then - xPlayer.setAccountMoney('bank', money_amount) - elseif money_type == 'black' then - xPlayer.setAccountMoney('black_money', money_amount) - else - TriggerClientEvent('chatMessage', playerId, 'SYSTEM', {255, 0, 0}, '^2' .. money_type .. ' ^0 is not a valid money type!') - return - end - else - TriggerClientEvent('chatMessage', playerId, 'SYSTEM', {255, 0, 0}, 'Invalid arguments.') - return - end - - print('es_extended: ' .. GetPlayerName(source) .. ' just set $' .. money_amount .. ' (' .. money_type .. ') to ' .. xPlayer.name) - - if xPlayer.source ~= playerId then - TriggerClientEvent('esx:showNotification', xPlayer.source, _U('money_set', money_amount, money_type)) - end -end, function(source, args, user) - TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficient Permissions.' } }) -end, {help = _U('setmoney'), params = {{name = 'id', help = _U('id_param')}, {name = 'money type', help = _U('money_type')}, {name = 'amount', help = _U('money_amount')}}}) - TriggerEvent('es:addGroupCommand', 'giveaccountmoney', 'admin', function(source, args, user) - local playerId = source local xPlayer = ESX.GetPlayerFromId(args[1]) - local account = args[2] - local amount = tonumber(args[3]) - if amount then - if xPlayer.getAccount(account) then - xPlayer.addAccountMoney(account, amount) + if xPlayer then + local account = args[2] + local amount = tonumber(args[3]) + + if amount then + if xPlayer.getAccount(account) then + xPlayer.addAccountMoney(account, amount) + else + TriggerClientEvent('esx:showNotification', source, _U('invalid_account')) + end else - TriggerClientEvent('esx:showNotification', playerId, _U('invalid_account')) + TriggerClientEvent('esx:showNotification', source, _U('amount_invalid')) end else - TriggerClientEvent('esx:showNotification', playerId, _U('amount_invalid')) + TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Player not online.' } }) end end, function(source, args, user) TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficient Permissions.' } }) end, {help = _U('giveaccountmoney'), params = {{name = 'id', help = _U('id_param')}, {name = 'account', help = _U('account')}, {name = 'amount', help = _U('money_amount')}}}) TriggerEvent('es:addGroupCommand', 'giveitem', 'admin', function(source, args, user) - local playerId = source local xPlayer = ESX.GetPlayerFromId(args[1]) - local item = args[2] - local count = (args[3] == nil and 1 or tonumber(args[3])) - if count then - if xPlayer.getInventoryItem(item) then - xPlayer.addInventoryItem(item, count) + if xPlayer then + local item = args[2] + local count = tonumber(args[3]) + + if count then + if xPlayer.getInventoryItem(item) then + xPlayer.addInventoryItem(item, count) + else + TriggerClientEvent('esx:showNotification', source, _U('invalid_item')) + end else - TriggerClientEvent('esx:showNotification', playerId, _U('invalid_item')) + TriggerClientEvent('esx:showNotification', source, _U('invalid_amount')) end else - TriggerClientEvent('esx:showNotification', playerId, _U('invalid_amount')) + TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Player not online.' } }) end end, function(source, args, user) TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficient Permissions.' } }) end, {help = _U('giveitem'), params = {{name = 'id', help = _U('id_param')}, {name = 'item', help = _U('item')}, {name = 'amount', help = _U('amount')}}}) TriggerEvent('es:addGroupCommand', 'giveweapon', 'admin', function(source, args, user) - local xPlayer = ESX.GetPlayerFromId(args[1]) - local weaponName = string.upper(args[2]) + local xPlayer = ESX.GetPlayerFromId(args[1]) - xPlayer.addWeapon(weaponName, tonumber(args[3])) + if xPlayer then + local weaponName = args[2] or 'unknown' + + if ESX.GetWeapon(weaponName) then + if xPlayer.hasWeapon(weaponName) then + TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Player already has that weapon.' } }) + else + xPlayer.addWeapon(weaponName, tonumber(args[3])) + end + else + TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Invalid weapon.' } }) + end + else + TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Player not online.' } }) + end end, function(source, args, user) TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficient Permissions.' } }) end, {help = _U('giveweapon'), params = {{name = 'id', help = _U('id_param')}, {name = 'weapon', help = _U('weapon')}, {name = 'ammo', help = _U('amountammo')}}})