From 97753b5d57e991d3fc10e977d8c20f28fe272e23 Mon Sep 17 00:00:00 2001 From: Breno Danyel Date: Wed, 25 Aug 2021 15:20:40 -0300 Subject: [PATCH 1/2] replace setElementHealth to killPed --- [gameplay]/freeroam/fr_client.lua | 4 +++- [gameplay]/freeroam/fr_server.lua | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[gameplay]/freeroam/fr_client.lua b/[gameplay]/freeroam/fr_client.lua index a08cef36c..5cde498d2 100644 --- a/[gameplay]/freeroam/fr_client.lua +++ b/[gameplay]/freeroam/fr_client.lua @@ -2130,7 +2130,9 @@ addEventHandler("onClientElementDestroy", root, onExitVehicle) function killLocalPlayer() if g_settings["kill"] then - setElementHealth(localPlayer,0) + if (not isPedDead(localPlayer)) then + triggerServerEvent("onFreeroamSuicide", localPlayer) + end else errMsg("Killing yourself is disallowed!") end diff --git a/[gameplay]/freeroam/fr_server.lua b/[gameplay]/freeroam/fr_server.lua index 2a2b35123..41cdc5e3e 100644 --- a/[gameplay]/freeroam/fr_server.lua +++ b/[gameplay]/freeroam/fr_server.lua @@ -604,3 +604,12 @@ function getPlayerName(player) end addEvent("onFreeroamLocalSettingChange",true) + +addEvent('onFreeroamSuicide', true) +addEventHandler('onFreeroamSuicide', root, function () + if isElement(client) and (not isPedDead(client)) then + killPed(client, client) + else + print('flood', getTickCount()) + end +end) From c086a08f16ce0c6e831857366de7bac58704dd35 Mon Sep 17 00:00:00 2001 From: Breno Danyel Date: Wed, 25 Aug 2021 15:35:57 -0300 Subject: [PATCH 2/2] remove debug print --- [gameplay]/freeroam/fr_server.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/[gameplay]/freeroam/fr_server.lua b/[gameplay]/freeroam/fr_server.lua index 41cdc5e3e..9f35ded7e 100644 --- a/[gameplay]/freeroam/fr_server.lua +++ b/[gameplay]/freeroam/fr_server.lua @@ -609,7 +609,5 @@ addEvent('onFreeroamSuicide', true) addEventHandler('onFreeroamSuicide', root, function () if isElement(client) and (not isPedDead(client)) then killPed(client, client) - else - print('flood', getTickCount()) end end)