Skip to content

freeroam: replace setElementHealth to killPed #350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 26, 2021
Merged

freeroam: replace setElementHealth to killPed #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97753b5
replace setElementHealth to killPed
brenodanyel Aug 25, 2021
c086a08
remove debug print
brenodanyel Aug 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion [gameplay]/freeroam/fr_client.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions [gameplay]/freeroam/fr_server.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,3 +604,10 @@ 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)
end
end)