From cd8879ba68fc98bcbffa469d56e7ad51447ffd49 Mon Sep 17 00:00:00 2001
From: Epyi <epyi.contact@gmail.com>
Date: Mon, 10 Jul 2023 10:47:01 +0200
Subject: [PATCH] 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