Skip to content

Commit c331e2e

Browse files
authored
freeroam: replace setElementHealth with killPed (#350)
* replace setElementHealth to killPed * remove debug print
1 parent fb8bae8 commit c331e2e

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

[gameplay]/freeroam/fr_client.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2130,7 +2130,9 @@ addEventHandler("onClientElementDestroy", root, onExitVehicle)
21302130

21312131
function killLocalPlayer()
21322132
if g_settings["kill"] then
2133-
setElementHealth(localPlayer,0)
2133+
if (not isPedDead(localPlayer)) then
2134+
triggerServerEvent("onFreeroamSuicide", localPlayer)
2135+
end
21342136
else
21352137
errMsg("Killing yourself is disallowed!")
21362138
end

[gameplay]/freeroam/fr_server.lua

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -604,3 +604,10 @@ function getPlayerName(player)
604604
end
605605

606606
addEvent("onFreeroamLocalSettingChange",true)
607+
608+
addEvent('onFreeroamSuicide', true)
609+
addEventHandler('onFreeroamSuicide', root, function ()
610+
if isElement(client) and (not isPedDead(client)) then
611+
killPed(client, client)
612+
end
613+
end)

0 commit comments

Comments
 (0)