From 11e9060281bfc2ca22107852757142a6e068447d Mon Sep 17 00:00:00 2001 From: Epyi Date: Sun, 9 Jul 2023 12:22:40 +0200 Subject: [PATCH 01/10] Add repair command - Add the repair command - Add missings locales for the repair command (not translated) - Make french translation for repair command --- [core]/es_extended/client/main.lua | 22 ++++++++++++++++++++++ [core]/es_extended/locales/cs.lua | 3 +++ [core]/es_extended/locales/da.lua | 3 +++ [core]/es_extended/locales/de.lua | 3 +++ [core]/es_extended/locales/en.lua | 3 +++ [core]/es_extended/locales/es.lua | 3 +++ [core]/es_extended/locales/fi.lua | 3 +++ [core]/es_extended/locales/fr.lua | 3 +++ [core]/es_extended/locales/hu.lua | 3 +++ [core]/es_extended/locales/it.lua | 3 +++ [core]/es_extended/locales/nl.lua | 3 +++ [core]/es_extended/locales/pl.lua | 3 +++ [core]/es_extended/locales/sl.lua | 3 +++ [core]/es_extended/locales/sr.lua | 3 +++ [core]/es_extended/locales/zh-cn.lua | 3 +++ [core]/es_extended/server/commands.lua | 4 ++++ 16 files changed, 68 insertions(+) diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua index 34a0f3e2..b14c8d57 100644 --- a/[core]/es_extended/client/main.lua +++ b/[core]/es_extended/client/main.lua @@ -670,6 +670,28 @@ AddEventHandler("esx:killPlayer", function() SetEntityHealth(ESX.PlayerData.ped, 0) end) +RegisterNetEvent("esx:repairPedVehicle") +AddEventHandler("esx:repairPedVehicle", function() + local GetVehiclePedIsIn = GetVehiclePedIsIn + + ESX.TriggerServerCallback("esx:isUserAdmin", function(admin) + if not admin then + return + end + local ped = ESX.PlayerData.ped + if IsPedInAnyVehicle(ped, false) then + local vehicle = GetVehiclePedIsIn(ped, false) + SetVehicleEngineHealth(vehicle, 1000) + SetVehicleEngineOn(vehicle, true, true) + SetVehicleFixed(vehicle) + SetVehicleDirtLevel(vehicle, 0) + ESX.ShowNotification(TranslateCap('command_repair_success'), true, false, 140) + else + ESX.ShowNotification(TranslateCap('not_in_vehicle'), true, false, 140) + end + end) +end) + RegisterNetEvent("esx:freezePlayer") AddEventHandler("esx:freezePlayer", function(input) local player = PlayerId() diff --git a/[core]/es_extended/locales/cs.lua b/[core]/es_extended/locales/cs.lua index 71bd3ea5..4cd51911 100644 --- a/[core]/es_extended/locales/cs.lua +++ b/[core]/es_extended/locales/cs.lua @@ -52,6 +52,7 @@ Locales["cs"] = { ["act_imp"] = "Nelze provést", ["in_vehicle"] = "Nelze provést, hráč je v autě", + ["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle", -- Commands ['command_bring'] = 'Přivolat si hráče k sobě', @@ -59,6 +60,8 @@ Locales["cs"] = { ['command_car_car'] = 'Zadej jméno vozidla nebo spawnname', ['command_cardel'] = 'Odstranění vozidla v okolí', ['command_cardel_radius'] = 'Odstranění vozidla v určeném dosahu', + ['command_repair'] = 'Repair your vehicle', + ['command_repair_success'] = "Successfully repaired vehicle", ['command_clear'] = 'Vymazat text v chatu', ['command_clearall'] = 'Vymazat chet pro všechny hráče', ['command_clearinventory'] = 'Vymazat všechny věci z invetáře hráče', diff --git a/[core]/es_extended/locales/da.lua b/[core]/es_extended/locales/da.lua index 518778bf..a5e87c12 100644 --- a/[core]/es_extended/locales/da.lua +++ b/[core]/es_extended/locales/da.lua @@ -52,6 +52,7 @@ Locales["da"] = { ["act_imp"] = "Kan ikke udføre handling", ["in_vehicle"] = "Kan ikke udføre handling, spilleren er i et køretøj", + ["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle", -- Commands ['command_bring'] = 'Tag en spiller til dig', @@ -59,6 +60,8 @@ Locales["da"] = { ['command_car_car'] = 'Køretøjsmodel eller hash', ['command_cardel'] = 'Fjern køretøjer i nærheden', ['command_cardel_radius'] = 'Fjerner alle køretøjer inden for den specificerede radius', + ['command_repair'] = 'Repair your vehicle', + ['command_repair_success'] = "Successfully repaired vehicle", ['command_clear'] = 'Ryd chatten', ['command_clearall'] = 'Ryd chatten for alle spillere', ['command_clearinventory'] = 'Fjern alle elementer fra spillernes inventar', diff --git a/[core]/es_extended/locales/de.lua b/[core]/es_extended/locales/de.lua index 285fe595..9aac4d1c 100644 --- a/[core]/es_extended/locales/de.lua +++ b/[core]/es_extended/locales/de.lua @@ -52,6 +52,7 @@ Locales["de"] = { ["act_imp"] = "Du kannst diese Aktion nicht ausführen!", ["in_vehicle"] = "Du kannst diese Aktion nicht ausführen! Person ist in einem Fahrzeug", + ["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle", -- Commands ['command_bring'] = 'Person zu dir bringen', @@ -59,6 +60,8 @@ Locales["de"] = { ['command_car_car'] = 'Fahrzeug Model oder Hash', ['command_cardel'] = 'Fahrzeuge entfernen', ['command_cardel_radius'] = 'Entfernt alle Fahrzeuge in einem bestimmten Radius', + ['command_repair'] = 'Repair your vehicle', + ['command_repair_success'] = "Successfully repaired vehicle", ['command_clear'] = 'Textchat leeren', ['command_clearall'] = 'Textchat leeren für alle Spieler leeren', ['command_clearinventory'] = 'Alle Items von dem Inventar eines Spielers entfernen', diff --git a/[core]/es_extended/locales/en.lua b/[core]/es_extended/locales/en.lua index 136819f5..05754436 100644 --- a/[core]/es_extended/locales/en.lua +++ b/[core]/es_extended/locales/en.lua @@ -52,6 +52,7 @@ Locales["en"] = { ["act_imp"] = "Cannot Perform Action", ["in_vehicle"] = "Cannot Perform Action, Player is in a vehicle", + ["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle", -- Commands ['command_bring'] = 'Bring player to you', @@ -59,6 +60,8 @@ Locales["en"] = { ['command_car_car'] = 'Vehicle model or hash', ['command_cardel'] = 'Remove vehicles in proximity', ['command_cardel_radius'] = 'Removes all vehicles within the specified radius', + ['command_repair'] = 'Repair your vehicle', + ['command_repair_success'] = "Successfully repaired vehicle", ['command_clear'] = 'Clear chat Text', ['command_clearall'] = 'Clear chat Text for all players', ['command_clearinventory'] = 'Remove All items from the Players Inventory', diff --git a/[core]/es_extended/locales/es.lua b/[core]/es_extended/locales/es.lua index 45bfb1d9..7e4d8954 100644 --- a/[core]/es_extended/locales/es.lua +++ b/[core]/es_extended/locales/es.lua @@ -52,6 +52,7 @@ Locales["es"] = { ["act_imp"] = "No se pudo realizar la acción.", ["in_vehicle"] = "Acción rechazada. El jugador se encuentra en un vehículo", + ["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle", -- Commands ['command_bring'] = 'Traer un jugador hacia ti', @@ -59,6 +60,8 @@ Locales["es"] = { ['command_car_car'] = 'Nombre del vehículo', ['command_cardel'] = 'Eliminar vehículos cercanos', ['command_cardel_radius'] = 'Opcional, eliminar todos los vehículos en el radio especificado', + ['command_repair'] = 'Repair your vehicle', + ['command_repair_success'] = "Successfully repaired vehicle", ['command_clear'] = 'Limpiar chat para ti', ['command_clearall'] = 'Limpiar chat para todos los jugadores', ['command_clearinventory'] = 'Limpiar el inventario del jugador', diff --git a/[core]/es_extended/locales/fi.lua b/[core]/es_extended/locales/fi.lua index 9eff6471..676484b8 100644 --- a/[core]/es_extended/locales/fi.lua +++ b/[core]/es_extended/locales/fi.lua @@ -52,12 +52,15 @@ Locales["fi"] = { ["act_imp"] = "Toiminto mahdoton", ["in_vehicle"] = "Et voi antaa ajoneuvossa olevalle mitään", + ["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle", -- Commands ['command_car'] = 'Luo ajoneuvo', ['command_car_car'] = 'Ajoneuvon nimi tai hash', ['command_cardel'] = 'Poistaa ajoneuvon läheltä', ['command_cardel_radius'] = 'Valinnainen, poista kaikki ajoneuvot määritetyllä säteellä', + ['command_repair'] = 'Repair your vehicle', + ['command_repair_success'] = "Successfully repaired vehicle", ['command_clear'] = 'Tyhjennä keskustelu', ['command_clearall'] = 'Tyhjennä keskustelu kaikilta pelaajilta', ['command_clearinventory'] = 'Tyhjennä pelaajan reppu', diff --git a/[core]/es_extended/locales/fr.lua b/[core]/es_extended/locales/fr.lua index e3c3166e..d8843ecd 100644 --- a/[core]/es_extended/locales/fr.lua +++ b/[core]/es_extended/locales/fr.lua @@ -52,6 +52,7 @@ Locales["fr"] = { ["act_imp"] = "Action impossible", ["in_vehicle"] = "Action impossible, le joueur est dans un véhicule", + ["not_in_vehicle"] = "Action impossible, le joueur n'est pas dans un véhicule", -- Commands ["command_bring"] = "Téléporter un joueur sur vous", @@ -59,6 +60,8 @@ Locales["fr"] = { ["command_car_car"] = "Nom ou hash du véhicule", ["command_cardel"] = "Supprimer les véhicules à proximité", ["command_cardel_radius"] = "Supprime tous les véhicules dans un rayon spécifié", + ["command_repair"] = "Réparer votre véhicule", + ["command_repair_success"] = "Véhicule réparé avec succès", ["command_clear"] = "Effacer le chat", ["command_clearall"] = "Effacer le chat de tous les joueurs", ["command_clearinventory"] = "Retirer tous les objets de l'inventaire du joueur", diff --git a/[core]/es_extended/locales/hu.lua b/[core]/es_extended/locales/hu.lua index b5336610..0a58f3fb 100644 --- a/[core]/es_extended/locales/hu.lua +++ b/[core]/es_extended/locales/hu.lua @@ -52,6 +52,7 @@ Locales["hu"] = { ["act_imp"] = "Érvénytelen mennyiség", ["in_vehicle"] = "Nem tudod átadni, mivel benne ül a jármüben", + ["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle", -- Commands ["command_bring"] = "Játékos magadhoz teleportálása", @@ -59,6 +60,8 @@ Locales["hu"] = { ["command_car_car"] = "Jármű név vagy hash", ["command_cardel"] = "Közeli járművek törlése", ["command_cardel_radius"] = "Megadott radiusban lévő járművek törlése", + ["command_repair"] = "Repair your vehicle", + ["command_repair_success"] = "Successfully repaired vehicle", ["command_clear"] = "Chat ürítése", ["command_clearall"] = "Chat ürítése minden játékosnál", ["command_clearinventory"] = "Minden tárgy törlése a játékos inventoryból", diff --git a/[core]/es_extended/locales/it.lua b/[core]/es_extended/locales/it.lua index 67b59bb7..ae66db6c 100644 --- a/[core]/es_extended/locales/it.lua +++ b/[core]/es_extended/locales/it.lua @@ -52,6 +52,7 @@ Locales["it"] = { ["act_imp"] = "Non puoi farlo", ["in_vehicle"] = "Non puoi farlo, il giocatore è in un veicolo", + ["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle", -- Commands ['command_bring'] = 'Porta il giocatore da te', @@ -59,6 +60,8 @@ Locales["it"] = { ['command_car_car'] = 'Modello o hash veicolo', ['command_cardel'] = 'Rimuovi i veicoli nelle prossimità', ['command_cardel_radius'] = 'Rimuovi i veicoli nel raggio specificato', + ['command_repair'] = 'Repair your vehicle', + ['command_repair_success'] = "Successfully repaired vehicle", ['command_clear'] = 'Pulisci la chat testuale', ['command_clearall'] = 'Pulisci la chat testuale per tutti i giocatori', ['command_clearinventory'] = 'Rimuovi tutti gli oggetti dall\' inventario del giocatore', diff --git a/[core]/es_extended/locales/nl.lua b/[core]/es_extended/locales/nl.lua index 9de0115e..7ca432e4 100644 --- a/[core]/es_extended/locales/nl.lua +++ b/[core]/es_extended/locales/nl.lua @@ -52,6 +52,7 @@ Locales["nl"] = { ["act_imp"] = "Kan actie niet uitvoeren", ["in_vehicle"] = "Kan actie niet uitvoeren, de speler zit in een voertuig.", + ["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle", -- Commands ['command_bring'] = 'Breng speler naar jou', @@ -59,6 +60,8 @@ Locales["nl"] = { ['command_car_car'] = 'Voertuig model of hash', ['command_cardel'] = 'Verwijder voertuigen in straal', ['command_cardel_radius'] = 'Verwijderd alle voertuigen in gewenste straal', + ['command_repair'] = 'Repair your vehicle', + ['command_repair_success'] = "Successfully repaired vehicle", ['command_clear'] = 'Verwijder chat berichten', ['command_clearall'] = 'Verwijder chat berichten voor alle spelers', ['command_clearinventory'] = 'Verwijder alle items van een speler zijn inventory', diff --git a/[core]/es_extended/locales/pl.lua b/[core]/es_extended/locales/pl.lua index dbea4a26..1ff34d65 100644 --- a/[core]/es_extended/locales/pl.lua +++ b/[core]/es_extended/locales/pl.lua @@ -51,12 +51,15 @@ Locales["pl"] = { ["account_money"] = "pieniądze", ["act_imp"] = "działanie niemożliwe", ["in_vehicle"] = "nie możesz przekazywać przedmiotów w pojeździe", + ["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle", -- Commands ['command_car'] = 'przywołaj pojazd', ['command_car_car'] = 'nazwa lub hash przywołanego pojazdu', ['command_cardel'] = 'usuń pojazd w pobliżu', ['command_cardel_radius'] = 'opcjonalnie usuń każdy pojazd w obszarze', + ['command_repair'] = 'Repair your vehicle', + ['command_repair_success'] = "Successfully repaired vehicle", ['command_clear'] = 'wyczyść czat', ['command_clearall'] = 'wyczyść czat dla wszystkich graczy', ['command_clearinventory'] = 'wyczyść ekwipunek gracza', diff --git a/[core]/es_extended/locales/sl.lua b/[core]/es_extended/locales/sl.lua index 4a485fd3..05e80ee2 100644 --- a/[core]/es_extended/locales/sl.lua +++ b/[core]/es_extended/locales/sl.lua @@ -52,6 +52,7 @@ Locales["sl"] = { ["act_imp"] = "Dejanja ni mogoče izvesti", ["in_vehicle"] = "Dejanja ni mogoče izvesti, Oseba je v vozilu", + ["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle", -- Commands ['command_bring'] = 'Teleportiraj osebo do sebe', @@ -59,6 +60,8 @@ Locales["sl"] = { ['command_car_car'] = 'Koda vozila', ['command_cardel'] = 'Odstranite vozila v bližini', ['command_cardel_radius'] = 'Odstrani vsa vozila v določenem radiju', + ['command_repair'] = 'Repair your vehicle', + ['command_repair_success'] = "Successfully repaired vehicle", ['command_clear'] = 'Odstrani vsa sporocila v CHATU', ['command_clearall'] = 'Počisti besedilo klepeta za vse igralce', ['command_clearinventory'] = 'Vzemi vse stvari iz osebove shrambe', diff --git a/[core]/es_extended/locales/sr.lua b/[core]/es_extended/locales/sr.lua index 5a5e8b39..8354dfb9 100644 --- a/[core]/es_extended/locales/sr.lua +++ b/[core]/es_extended/locales/sr.lua @@ -52,6 +52,7 @@ Locales["sr"] = { ["act_imp"] = "Ne možete izvršiti radnju", ["in_vehicle"] = "Ne možete uraditi to dok je igrač u vozilu", + ["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle", -- Commands ['command_bring'] = 'TP-ajte igrača do Vas', @@ -59,6 +60,8 @@ Locales["sr"] = { ['command_car_car'] = 'Model ili hash vozila', ['command_cardel'] = 'Obrišite vozilo u blizini', ['command_cardel_radius'] = 'Obrišite sva vozila unutar navedenog radiusa', + ['command_repair'] = 'Repair your vehicle', + ['command_repair_success'] = "Successfully repaired vehicle", ['command_clear'] = 'Obrišite chat', ['command_clearall'] = 'Obrišite chat za sve igrače', ['command_clearinventory'] = 'Obrišite sve stvari iz inventara igrača', diff --git a/[core]/es_extended/locales/zh-cn.lua b/[core]/es_extended/locales/zh-cn.lua index e7500981..73d840d3 100644 --- a/[core]/es_extended/locales/zh-cn.lua +++ b/[core]/es_extended/locales/zh-cn.lua @@ -52,6 +52,7 @@ Locales["zh-cn"] = { ["act_imp"] = "操作失败", ["in_vehicle"] = "请离开当前载具", + ["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle", -- Commands ['command_bring'] = '传送玩家到您身边', @@ -59,6 +60,8 @@ Locales["zh-cn"] = { ['command_car_car'] = '生成载具的模型名称或哈希值', ['command_cardel'] = '删除附近载具', ['command_cardel_radius'] = '可选，删除指定半径内的所有载具', + ['command_repair'] = 'Repair your vehicle', + ['command_repair_success'] = "Successfully repaired vehicle", ['command_clear'] = '清除聊天记录', ['command_clearall'] = '清除所有玩家的聊天记录', ['command_clearinventory'] = '清除玩家库存', diff --git a/[core]/es_extended/server/commands.lua b/[core]/es_extended/server/commands.lua index 7e160870..eda32082 100644 --- a/[core]/es_extended/server/commands.lua +++ b/[core]/es_extended/server/commands.lua @@ -132,6 +132,10 @@ end, false, { } }) +ESX.RegisterCommand('repair', 'admin', function(xPlayer, args, showError) + xPlayer.triggerEvent("esx:repairPedVehicle") +end, false, {help = TranslateCap('command_repair'), validate = false}) + ESX.RegisterCommand('setaccountmoney', 'admin', function(xPlayer, args, showError) if not args.playerId.getAccount(args.account) then return showError(TranslateCap('command_giveaccountmoney_invalid')) From 89ac750d0398c994a8672574eed6a4594f5b1bc3 Mon Sep 17 00:00:00 2001 From: Epyi Date: Sun, 9 Jul 2023 12:26:37 +0200 Subject: [PATCH 02/10] Minor fix --- [core]/es_extended/locales/en.lua | 2 +- [core]/es_extended/locales/nl.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[core]/es_extended/locales/en.lua b/[core]/es_extended/locales/en.lua index 05754436..e2fe2bf0 100644 --- a/[core]/es_extended/locales/en.lua +++ b/[core]/es_extended/locales/en.lua @@ -61,7 +61,7 @@ Locales["en"] = { ['command_cardel'] = 'Remove vehicles in proximity', ['command_cardel_radius'] = 'Removes all vehicles within the specified radius', ['command_repair'] = 'Repair your vehicle', - ['command_repair_success'] = "Successfully repaired vehicle", + ['command_repair_success'] = "Successfully repaired vehicle", ['command_clear'] = 'Clear chat Text', ['command_clearall'] = 'Clear chat Text for all players', ['command_clearinventory'] = 'Remove All items from the Players Inventory', diff --git a/[core]/es_extended/locales/nl.lua b/[core]/es_extended/locales/nl.lua index 7ca432e4..5b7ec656 100644 --- a/[core]/es_extended/locales/nl.lua +++ b/[core]/es_extended/locales/nl.lua @@ -61,7 +61,7 @@ Locales["nl"] = { ['command_cardel'] = 'Verwijder voertuigen in straal', ['command_cardel_radius'] = 'Verwijderd alle voertuigen in gewenste straal', ['command_repair'] = 'Repair your vehicle', - ['command_repair_success'] = "Successfully repaired vehicle", + ['command_repair_success'] = "Successfully repaired vehicle", ['command_clear'] = 'Verwijder chat berichten', ['command_clearall'] = 'Verwijder chat berichten voor alle spelers', ['command_clearinventory'] = 'Verwijder alle items van een speler zijn inventory', From e919d2c4d9812337fc4bbb9e6ae4bb8c1d62e97b Mon Sep 17 00:00:00 2001 From: Epyi Date: Sun, 9 Jul 2023 17:39:51 +0200 Subject: [PATCH 03/10] Check if player is in vehicle (and the driver) --- [core]/es_extended/client/main.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua index b14c8d57..8d079d5d 100644 --- a/[core]/es_extended/client/main.lua +++ b/[core]/es_extended/client/main.lua @@ -679,16 +679,16 @@ AddEventHandler("esx:repairPedVehicle", function() return end local ped = ESX.PlayerData.ped - if IsPedInAnyVehicle(ped, false) then - local vehicle = GetVehiclePedIsIn(ped, false) - SetVehicleEngineHealth(vehicle, 1000) - SetVehicleEngineOn(vehicle, true, true) - SetVehicleFixed(vehicle) - SetVehicleDirtLevel(vehicle, 0) - ESX.ShowNotification(TranslateCap('command_repair_success'), true, false, 140) - else + local vehicle = GetVehiclePedIsIn(ped, false) + if not vehicle or GetPedInVehicleSeat(vehicle, -1) ~= ped then ESX.ShowNotification(TranslateCap('not_in_vehicle'), true, false, 140) + return end + SetVehicleEngineHealth(vehicle, 1000) + SetVehicleEngineOn(vehicle, true, true) + SetVehicleFixed(vehicle) + SetVehicleDirtLevel(vehicle, 0) + ESX.ShowNotification(TranslateCap('command_repair_success'), true, false, 140) end) end) From ce5a8d7ab83479394bf5247e3a5bf12d473a488c Mon Sep 17 00:00:00 2001 From: Epyi Date: Sun, 9 Jul 2023 18:06:24 +0200 Subject: [PATCH 04/10] Put in vehicle checker on server side --- [core]/es_extended/client/main.lua | 4 ---- [core]/es_extended/server/commands.lua | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua index 8d079d5d..4ba09f96 100644 --- a/[core]/es_extended/client/main.lua +++ b/[core]/es_extended/client/main.lua @@ -680,10 +680,6 @@ AddEventHandler("esx:repairPedVehicle", function() end local ped = ESX.PlayerData.ped local vehicle = GetVehiclePedIsIn(ped, false) - if not vehicle or GetPedInVehicleSeat(vehicle, -1) ~= ped then - ESX.ShowNotification(TranslateCap('not_in_vehicle'), true, false, 140) - return - end SetVehicleEngineHealth(vehicle, 1000) SetVehicleEngineOn(vehicle, true, true) SetVehicleFixed(vehicle) diff --git a/[core]/es_extended/server/commands.lua b/[core]/es_extended/server/commands.lua index eda32082..f6f5cb51 100644 --- a/[core]/es_extended/server/commands.lua +++ b/[core]/es_extended/server/commands.lua @@ -133,6 +133,12 @@ end, false, { }) ESX.RegisterCommand('repair', 'admin', function(xPlayer, args, showError) + local ped = GetPlayerPed(xPlayer.source) + local pedVehicle = GetVehiclePedIsIn(ped, false) + if not pedVehicle or GetPedInVehicleSeat(pedVehicle, -1) ~= ped then + return + showError(TranslateCap('not_in_vehicle')) + end xPlayer.triggerEvent("esx:repairPedVehicle") end, false, {help = TranslateCap('command_repair'), validate = false}) From e0707db8f7efa4d5e84f8126a046c778d043ea36 Mon Sep 17 00:00:00 2001 From: Epyi Date: Sun, 9 Jul 2023 19:21:31 +0200 Subject: [PATCH 05/10] Update commands.lua --- [core]/es_extended/server/commands.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[core]/es_extended/server/commands.lua b/[core]/es_extended/server/commands.lua index f6f5cb51..a72171b0 100644 --- a/[core]/es_extended/server/commands.lua +++ b/[core]/es_extended/server/commands.lua @@ -136,8 +136,8 @@ ESX.RegisterCommand('repair', 'admin', function(xPlayer, args, showError) local ped = GetPlayerPed(xPlayer.source) local pedVehicle = GetVehiclePedIsIn(ped, false) if not pedVehicle or GetPedInVehicleSeat(pedVehicle, -1) ~= ped then - return showError(TranslateCap('not_in_vehicle')) + return end xPlayer.triggerEvent("esx:repairPedVehicle") end, false, {help = TranslateCap('command_repair'), validate = false}) From cd8879ba68fc98bcbffa469d56e7ad51447ffd49 Mon Sep 17 00:00:00 2001 From: Epyi Date: Mon, 10 Jul 2023 10:47:01 +0200 Subject: [PATCH 06/10] Add {fix, repair} & support id --- [core]/es_extended/client/main.lua | 19 ++++++------------- [core]/es_extended/server/commands.lua | 15 +++++++++++---- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua index dffc947a..a7ae816a 100644 --- a/[core]/es_extended/client/main.lua +++ b/[core]/es_extended/client/main.lua @@ -669,19 +669,12 @@ end) RegisterNetEvent("esx:repairPedVehicle") AddEventHandler("esx:repairPedVehicle", function() local GetVehiclePedIsIn = GetVehiclePedIsIn - - ESX.TriggerServerCallback("esx:isUserAdmin", function(admin) - if not admin then - return - end - local ped = ESX.PlayerData.ped - local vehicle = GetVehiclePedIsIn(ped, false) - SetVehicleEngineHealth(vehicle, 1000) - SetVehicleEngineOn(vehicle, true, true) - SetVehicleFixed(vehicle) - SetVehicleDirtLevel(vehicle, 0) - ESX.ShowNotification(TranslateCap('command_repair_success'), true, false, 140) - end) + local ped = ESX.PlayerData.ped + local vehicle = GetVehiclePedIsIn(ped, false) + SetVehicleEngineHealth(vehicle, 1000) + SetVehicleEngineOn(vehicle, true, true) + SetVehicleFixed(vehicle) + SetVehicleDirtLevel(vehicle, 0) end) RegisterNetEvent("esx:freezePlayer") diff --git a/[core]/es_extended/server/commands.lua b/[core]/es_extended/server/commands.lua index 16987142..75758235 100644 --- a/[core]/es_extended/server/commands.lua +++ b/[core]/es_extended/server/commands.lua @@ -132,15 +132,22 @@ end, false, { } }) -ESX.RegisterCommand('repair', 'admin', function(xPlayer, args, showError) - local ped = GetPlayerPed(xPlayer.source) +ESX.RegisterCommand({ 'fix', 'repair' }, 'admin', function(xPlayer, args, showError) + local ped = GetPlayerPed(args.playerId.source) local pedVehicle = GetVehiclePedIsIn(ped, false) if not pedVehicle or GetPedInVehicleSeat(pedVehicle, -1) ~= ped then showError(TranslateCap('not_in_vehicle')) return end - xPlayer.triggerEvent("esx:repairPedVehicle") -end, false, {help = TranslateCap('command_repair'), validate = false}) + args.playerId.triggerEvent("esx:repairPedVehicle") + xPlayer.showNotification(TranslateCap('command_repair_success'), true, false, 140) +end, true, { + help = TranslateCap('command_repair'), + validate = false, + arguments = { + { name = 'playerId', help = TranslateCap('commandgeneric_playerid'), type = 'player' } + } +}) ESX.RegisterCommand('setaccountmoney', 'admin', function(xPlayer, args, showError) if not args.playerId.getAccount(args.account) then From ed2cbafc5e737066fa91aa8cd28a99a5a1490c14 Mon Sep 17 00:00:00 2001 From: Epyi Date: Tue, 11 Jul 2023 16:11:38 +0200 Subject: [PATCH 07/10] Removed GetVehiclePedIsIn --- [core]/es_extended/client/main.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua index aaa9053f..15d2c70b 100644 --- a/[core]/es_extended/client/main.lua +++ b/[core]/es_extended/client/main.lua @@ -666,7 +666,6 @@ end) RegisterNetEvent("esx:repairPedVehicle") AddEventHandler("esx:repairPedVehicle", function() - local GetVehiclePedIsIn = GetVehiclePedIsIn local ped = ESX.PlayerData.ped local vehicle = GetVehiclePedIsIn(ped, false) SetVehicleEngineHealth(vehicle, 1000) From 4839877b3cee4ef880523443b2d08ea277288285 Mon Sep 17 00:00:00 2001 From: Epyi Date: Tue, 11 Jul 2023 16:13:00 +0200 Subject: [PATCH 08/10] Added discord log --- [core]/es_extended/server/commands.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/[core]/es_extended/server/commands.lua b/[core]/es_extended/server/commands.lua index 75758235..b033fb32 100644 --- a/[core]/es_extended/server/commands.lua +++ b/[core]/es_extended/server/commands.lua @@ -141,6 +141,13 @@ ESX.RegisterCommand({ 'fix', 'repair' }, 'admin', function(xPlayer, args, showEr end args.playerId.triggerEvent("esx:repairPedVehicle") xPlayer.showNotification(TranslateCap('command_repair_success'), true, false, 140) + if Config.AdminLogging then + ESX.DiscordLogFields("UserActions", "Fix Vehicle /fix Triggered!", "pink", { + { name = "Player", value = xPlayer.name, inline = true }, + { name = "ID", value = xPlayer.source, inline = true }, + { name = "Target", value = args.playerId.name, inline = true }, + }) + end end, true, { help = TranslateCap('command_repair'), validate = false, From ead06af6eb469bd004c6cb2e755fec93bf9d4f51 Mon Sep 17 00:00:00 2001 From: Epyi Date: Tue, 11 Jul 2023 17:22:43 +0200 Subject: [PATCH 09/10] Add notification to target - Add notification to target - Add missing locales (not translated) - Translate french locale --- [core]/es_extended/locales/cs.lua | 3 ++- [core]/es_extended/locales/da.lua | 3 ++- [core]/es_extended/locales/de.lua | 3 ++- [core]/es_extended/locales/en.lua | 3 ++- [core]/es_extended/locales/es.lua | 3 ++- [core]/es_extended/locales/fi.lua | 3 ++- [core]/es_extended/locales/fr.lua | 1 + [core]/es_extended/locales/hu.lua | 1 + [core]/es_extended/locales/it.lua | 3 ++- [core]/es_extended/locales/nl.lua | 3 ++- [core]/es_extended/locales/pl.lua | 3 ++- [core]/es_extended/locales/sl.lua | 3 ++- [core]/es_extended/locales/sr.lua | 3 ++- [core]/es_extended/locales/zh-cn.lua | 3 ++- [core]/es_extended/server/commands.lua | 3 +++ 15 files changed, 29 insertions(+), 12 deletions(-) diff --git a/[core]/es_extended/locales/cs.lua b/[core]/es_extended/locales/cs.lua index 4cd51911..69438ad3 100644 --- a/[core]/es_extended/locales/cs.lua +++ b/[core]/es_extended/locales/cs.lua @@ -61,7 +61,8 @@ Locales["cs"] = { ['command_cardel'] = 'Odstranění vozidla v okolí', ['command_cardel_radius'] = 'Odstranění vozidla v určeném dosahu', ['command_repair'] = 'Repair your vehicle', - ['command_repair_success'] = "Successfully repaired vehicle", + ['command_repair_success'] = 'Successfully repaired vehicle', + ['command_repair_success_target'] = 'An admin repaired your vehicle', ['command_clear'] = 'Vymazat text v chatu', ['command_clearall'] = 'Vymazat chet pro všechny hráče', ['command_clearinventory'] = 'Vymazat všechny věci z invetáře hráče', diff --git a/[core]/es_extended/locales/da.lua b/[core]/es_extended/locales/da.lua index a5e87c12..59fea38a 100644 --- a/[core]/es_extended/locales/da.lua +++ b/[core]/es_extended/locales/da.lua @@ -61,7 +61,8 @@ Locales["da"] = { ['command_cardel'] = 'Fjern køretøjer i nærheden', ['command_cardel_radius'] = 'Fjerner alle køretøjer inden for den specificerede radius', ['command_repair'] = 'Repair your vehicle', - ['command_repair_success'] = "Successfully repaired vehicle", + ['command_repair_success'] = 'Successfully repaired vehicle', + ['command_repair_success_target'] = 'An admin repaired your vehicle', ['command_clear'] = 'Ryd chatten', ['command_clearall'] = 'Ryd chatten for alle spillere', ['command_clearinventory'] = 'Fjern alle elementer fra spillernes inventar', diff --git a/[core]/es_extended/locales/de.lua b/[core]/es_extended/locales/de.lua index 9aac4d1c..2cf5c327 100644 --- a/[core]/es_extended/locales/de.lua +++ b/[core]/es_extended/locales/de.lua @@ -61,7 +61,8 @@ Locales["de"] = { ['command_cardel'] = 'Fahrzeuge entfernen', ['command_cardel_radius'] = 'Entfernt alle Fahrzeuge in einem bestimmten Radius', ['command_repair'] = 'Repair your vehicle', - ['command_repair_success'] = "Successfully repaired vehicle", + ['command_repair_success'] = 'Successfully repaired vehicle', + ['command_repair_success_target'] = 'An admin repaired your vehicle', ['command_clear'] = 'Textchat leeren', ['command_clearall'] = 'Textchat leeren für alle Spieler leeren', ['command_clearinventory'] = 'Alle Items von dem Inventar eines Spielers entfernen', diff --git a/[core]/es_extended/locales/en.lua b/[core]/es_extended/locales/en.lua index e2fe2bf0..e8044acc 100644 --- a/[core]/es_extended/locales/en.lua +++ b/[core]/es_extended/locales/en.lua @@ -61,7 +61,8 @@ Locales["en"] = { ['command_cardel'] = 'Remove vehicles in proximity', ['command_cardel_radius'] = 'Removes all vehicles within the specified radius', ['command_repair'] = 'Repair your vehicle', - ['command_repair_success'] = "Successfully repaired vehicle", + ['command_repair_success'] = 'Successfully repaired vehicle', + ['command_repair_success_target'] = 'An admin repaired your vehicle', ['command_clear'] = 'Clear chat Text', ['command_clearall'] = 'Clear chat Text for all players', ['command_clearinventory'] = 'Remove All items from the Players Inventory', diff --git a/[core]/es_extended/locales/es.lua b/[core]/es_extended/locales/es.lua index 7e4d8954..021705e5 100644 --- a/[core]/es_extended/locales/es.lua +++ b/[core]/es_extended/locales/es.lua @@ -61,7 +61,8 @@ Locales["es"] = { ['command_cardel'] = 'Eliminar vehículos cercanos', ['command_cardel_radius'] = 'Opcional, eliminar todos los vehículos en el radio especificado', ['command_repair'] = 'Repair your vehicle', - ['command_repair_success'] = "Successfully repaired vehicle", + ['command_repair_success'] = 'Successfully repaired vehicle', + ['command_repair_success_target'] = 'An admin repaired your vehicle', ['command_clear'] = 'Limpiar chat para ti', ['command_clearall'] = 'Limpiar chat para todos los jugadores', ['command_clearinventory'] = 'Limpiar el inventario del jugador', diff --git a/[core]/es_extended/locales/fi.lua b/[core]/es_extended/locales/fi.lua index 676484b8..9ee9fd79 100644 --- a/[core]/es_extended/locales/fi.lua +++ b/[core]/es_extended/locales/fi.lua @@ -60,7 +60,8 @@ Locales["fi"] = { ['command_cardel'] = 'Poistaa ajoneuvon läheltä', ['command_cardel_radius'] = 'Valinnainen, poista kaikki ajoneuvot määritetyllä säteellä', ['command_repair'] = 'Repair your vehicle', - ['command_repair_success'] = "Successfully repaired vehicle", + ['command_repair_success'] = 'Successfully repaired vehicle', + ['command_repair_success_target'] = 'An admin repaired your vehicle', ['command_clear'] = 'Tyhjennä keskustelu', ['command_clearall'] = 'Tyhjennä keskustelu kaikilta pelaajilta', ['command_clearinventory'] = 'Tyhjennä pelaajan reppu', diff --git a/[core]/es_extended/locales/fr.lua b/[core]/es_extended/locales/fr.lua index a323202d..1a11bb35 100644 --- a/[core]/es_extended/locales/fr.lua +++ b/[core]/es_extended/locales/fr.lua @@ -62,6 +62,7 @@ Locales["fr"] = { ["command_cardel_radius"] = "Supprime tous les véhicules dans un rayon spécifié", ["command_repair"] = "Réparer votre véhicule", ["command_repair_success"] = "Véhicule réparé avec succès", + ["command_repair_success_target"] = "Votre véhicule a été réparé par un membre du staff", ["command_clear"] = "Effacer le chat", ["command_clearall"] = "Effacer le chat de tous les joueurs", ["command_clearinventory"] = "Retirer tous les objets de l'inventaire du joueur", diff --git a/[core]/es_extended/locales/hu.lua b/[core]/es_extended/locales/hu.lua index 0a58f3fb..7e6b039d 100644 --- a/[core]/es_extended/locales/hu.lua +++ b/[core]/es_extended/locales/hu.lua @@ -62,6 +62,7 @@ Locales["hu"] = { ["command_cardel_radius"] = "Megadott radiusban lévő járművek törlése", ["command_repair"] = "Repair your vehicle", ["command_repair_success"] = "Successfully repaired vehicle", + ["command_repair_success_target"] = "An admin repaired your vehicle", ["command_clear"] = "Chat ürítése", ["command_clearall"] = "Chat ürítése minden játékosnál", ["command_clearinventory"] = "Minden tárgy törlése a játékos inventoryból", diff --git a/[core]/es_extended/locales/it.lua b/[core]/es_extended/locales/it.lua index ae66db6c..d3b0e396 100644 --- a/[core]/es_extended/locales/it.lua +++ b/[core]/es_extended/locales/it.lua @@ -61,7 +61,8 @@ Locales["it"] = { ['command_cardel'] = 'Rimuovi i veicoli nelle prossimità', ['command_cardel_radius'] = 'Rimuovi i veicoli nel raggio specificato', ['command_repair'] = 'Repair your vehicle', - ['command_repair_success'] = "Successfully repaired vehicle", + ['command_repair_success'] = 'Successfully repaired vehicle', + ['command_repair_success_target'] = 'An admin repaired your vehicle', ['command_clear'] = 'Pulisci la chat testuale', ['command_clearall'] = 'Pulisci la chat testuale per tutti i giocatori', ['command_clearinventory'] = 'Rimuovi tutti gli oggetti dall\' inventario del giocatore', diff --git a/[core]/es_extended/locales/nl.lua b/[core]/es_extended/locales/nl.lua index f870aec7..c8a4132d 100644 --- a/[core]/es_extended/locales/nl.lua +++ b/[core]/es_extended/locales/nl.lua @@ -61,7 +61,8 @@ Locales["nl"] = { ['command_cardel'] = 'Verwijder voertuigen in straal', ['command_cardel_radius'] = 'Verwijderd alle voertuigen in gewenste straal', ['command_repair'] = 'Repair your vehicle', - ['command_repair_success'] = "Successfully repaired vehicle", + ['command_repair_success'] = 'Successfully repaired vehicle', + ['command_repair_success_target'] = 'An admin repaired your vehicle', ['command_clear'] = 'Verwijder chat berichten', ['command_clearall'] = 'Verwijder chat berichten voor alle spelers', ['command_clearinventory'] = 'Verwijder alle items van een speler zijn inventory', diff --git a/[core]/es_extended/locales/pl.lua b/[core]/es_extended/locales/pl.lua index 1ff34d65..cee94971 100644 --- a/[core]/es_extended/locales/pl.lua +++ b/[core]/es_extended/locales/pl.lua @@ -59,7 +59,8 @@ Locales["pl"] = { ['command_cardel'] = 'usuń pojazd w pobliżu', ['command_cardel_radius'] = 'opcjonalnie usuń każdy pojazd w obszarze', ['command_repair'] = 'Repair your vehicle', - ['command_repair_success'] = "Successfully repaired vehicle", + ['command_repair_success'] = 'Successfully repaired vehicle', + ['command_repair_success_target'] = 'An admin repaired your vehicle', ['command_clear'] = 'wyczyść czat', ['command_clearall'] = 'wyczyść czat dla wszystkich graczy', ['command_clearinventory'] = 'wyczyść ekwipunek gracza', diff --git a/[core]/es_extended/locales/sl.lua b/[core]/es_extended/locales/sl.lua index 45e2884b..a502d48e 100644 --- a/[core]/es_extended/locales/sl.lua +++ b/[core]/es_extended/locales/sl.lua @@ -61,7 +61,8 @@ Locales["sl"] = { ['command_cardel'] = 'Odstranite vozila v bližini', ['command_cardel_radius'] = 'Odstrani vsa vozila v določenem radiju', ['command_repair'] = 'Repair your vehicle', - ['command_repair_success'] = "Successfully repaired vehicle", + ['command_repair_success'] = 'Successfully repaired vehicle', + ['command_repair_success_target'] = 'An admin repaired your vehicle', ['command_clear'] = 'Odstrani vsa sporocila v CHATU', ['command_clearall'] = 'Počisti besedilo klepeta za vse igralce', ['command_clearinventory'] = 'Vzemi vse stvari iz osebove shrambe', diff --git a/[core]/es_extended/locales/sr.lua b/[core]/es_extended/locales/sr.lua index 8354dfb9..a6a15ebf 100644 --- a/[core]/es_extended/locales/sr.lua +++ b/[core]/es_extended/locales/sr.lua @@ -61,7 +61,8 @@ Locales["sr"] = { ['command_cardel'] = 'Obrišite vozilo u blizini', ['command_cardel_radius'] = 'Obrišite sva vozila unutar navedenog radiusa', ['command_repair'] = 'Repair your vehicle', - ['command_repair_success'] = "Successfully repaired vehicle", + ['command_repair_success'] = 'Successfully repaired vehicle', + ['command_repair_success_target'] = 'An admin repaired your vehicle', ['command_clear'] = 'Obrišite chat', ['command_clearall'] = 'Obrišite chat za sve igrače', ['command_clearinventory'] = 'Obrišite sve stvari iz inventara igrača', diff --git a/[core]/es_extended/locales/zh-cn.lua b/[core]/es_extended/locales/zh-cn.lua index 73d840d3..b2729714 100644 --- a/[core]/es_extended/locales/zh-cn.lua +++ b/[core]/es_extended/locales/zh-cn.lua @@ -61,7 +61,8 @@ Locales["zh-cn"] = { ['command_cardel'] = '删除附近载具', ['command_cardel_radius'] = '可选，删除指定半径内的所有载具', ['command_repair'] = 'Repair your vehicle', - ['command_repair_success'] = "Successfully repaired vehicle", + ['command_repair_success'] = 'Successfully repaired vehicle', + ['command_repair_success_target'] = 'An admin repaired your vehicle', ['command_clear'] = '清除聊天记录', ['command_clearall'] = '清除所有玩家的聊天记录', ['command_clearinventory'] = '清除玩家库存', diff --git a/[core]/es_extended/server/commands.lua b/[core]/es_extended/server/commands.lua index b033fb32..e23e8d2a 100644 --- a/[core]/es_extended/server/commands.lua +++ b/[core]/es_extended/server/commands.lua @@ -141,6 +141,9 @@ ESX.RegisterCommand({ 'fix', 'repair' }, 'admin', function(xPlayer, args, showEr end args.playerId.triggerEvent("esx:repairPedVehicle") xPlayer.showNotification(TranslateCap('command_repair_success'), true, false, 140) + if xPlayer.source ~= args.playerId.source then + args.playerId.showNotification(TranslateCap('command_repair_success_target'), true, false, 140) + end if Config.AdminLogging then ESX.DiscordLogFields("UserActions", "Fix Vehicle /fix Triggered!", "pink", { { name = "Player", value = xPlayer.name, inline = true }, From 4d5ba67ba514c5e9fe1f33bbc5276556b95bc308 Mon Sep 17 00:00:00 2001 From: Gellipapa Date: Tue, 11 Jul 2023 17:31:35 +0200 Subject: [PATCH 10/10] :recycle: replace args.playerId to xTarget --- [core]/es_extended/server/commands.lua | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/[core]/es_extended/server/commands.lua b/[core]/es_extended/server/commands.lua index e23e8d2a..17a1dfcf 100644 --- a/[core]/es_extended/server/commands.lua +++ b/[core]/es_extended/server/commands.lua @@ -133,22 +133,23 @@ end, false, { }) ESX.RegisterCommand({ 'fix', 'repair' }, 'admin', function(xPlayer, args, showError) - local ped = GetPlayerPed(args.playerId.source) + local xTarget = args.playerId + local ped = GetPlayerPed(xTarget.source) local pedVehicle = GetVehiclePedIsIn(ped, false) if not pedVehicle or GetPedInVehicleSeat(pedVehicle, -1) ~= ped then showError(TranslateCap('not_in_vehicle')) return end - args.playerId.triggerEvent("esx:repairPedVehicle") + xTarget.triggerEvent("esx:repairPedVehicle") xPlayer.showNotification(TranslateCap('command_repair_success'), true, false, 140) - if xPlayer.source ~= args.playerId.source then - args.playerId.showNotification(TranslateCap('command_repair_success_target'), true, false, 140) + if xPlayer.source ~= xTarget.source then + xTarget.showNotification(TranslateCap('command_repair_success_target'), true, false, 140) end if Config.AdminLogging then ESX.DiscordLogFields("UserActions", "Fix Vehicle /fix Triggered!", "pink", { { name = "Player", value = xPlayer.name, inline = true }, { name = "ID", value = xPlayer.source, inline = true }, - { name = "Target", value = args.playerId.name, inline = true }, + { name = "Target", value = xTarget.name, inline = true }, }) end end, true, {