From 26a8f176b01bf17fd9f6404d9b3084b2cb12c99e Mon Sep 17 00:00:00 2001 From: Linden Date: Sat, 3 Jul 2021 13:20:10 +1000 Subject: [PATCH] improvement(ambulancejob): Support revive through txAdmin --- [esx_addons]/esx_ambulancejob/server/main.lua | 43 +++++++++++++------ 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/[esx_addons]/esx_ambulancejob/server/main.lua b/[esx_addons]/esx_ambulancejob/server/main.lua index 7f7f1b17..ee7a5b7c 100644 --- a/[esx_addons]/esx_ambulancejob/server/main.lua +++ b/[esx_addons]/esx_ambulancejob/server/main.lua @@ -6,26 +6,41 @@ TriggerEvent('esx_society:registerSociety', 'ambulance', 'Ambulance', 'society_a RegisterNetEvent('esx_ambulancejob:revive') AddEventHandler('esx_ambulancejob:revive', function(playerId) - local xPlayer = ESX.GetPlayerFromId(source) + playerId = tonumber(playerId) + if source == '' and GetInvokingResource() == 'monitor' then -- txAdmin support + local xTarget = ESX.GetPlayerFromId(playerId) + if xTarget then + if deadPlayers[playerId] then + print(_U('revive_complete', xTarget.name)) + xTarget.triggerEvent('esx_ambulancejob:revive') + else + print(_U('player_not_unconscious')) + end + else + print(_U('revive_fail_offline')) + end + else + local xPlayer = source and ESX.GetPlayerFromId(source) - if xPlayer and xPlayer.job.name == 'ambulance' then - local xTarget = ESX.GetPlayerFromId(playerId) + if xPlayer and xPlayer.job.name == 'ambulance' then + local xTarget = ESX.GetPlayerFromId(playerId) - if xTarget then - if deadPlayers[playerId] then - if Config.ReviveReward > 0 then - xPlayer.showNotification(_U('revive_complete_award', xTarget.name, Config.ReviveReward)) - xPlayer.addMoney(Config.ReviveReward) - xTarget.triggerEvent('esx_ambulancejob:revive') + if xTarget then + if deadPlayers[playerId] then + if Config.ReviveReward > 0 then + xPlayer.showNotification(_U('revive_complete_award', xTarget.name, Config.ReviveReward)) + xPlayer.addMoney(Config.ReviveReward) + xTarget.triggerEvent('esx_ambulancejob:revive') + else + xPlayer.showNotification(_U('revive_complete', xTarget.name)) + xTarget.triggerEvent('esx_ambulancejob:revive') + end else - xPlayer.showNotification(_U('revive_complete', xTarget.name)) - xTarget.triggerEvent('esx_ambulancejob:revive') + xPlayer.showNotification(_U('player_not_unconscious')) end else - xPlayer.showNotification(_U('player_not_unconscious')) + xPlayer.showNotification(_U('revive_fail_offline')) end - else - xPlayer.showNotification(_U('revive_fail_offline')) end end end)