Skip to content

Commit 533ee35

Browse files
committed
Fix a bug causing OnPlayerDeath to be executed due to killPed(player) being executed way before doingclasssel was set to true
1 parent d08d23b commit 533ee35

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

amx/server/events.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ function gameModeInit(player)
2727
g_Players[playerID].streamedPlayers = {}
2828
if g_PlayerClasses[0] then
2929
g_Players[playerID].viewingintro = true
30-
g_Players[playerID].doingclasssel = true
3130
fadeCamera(player, true)
3231
setTimer(
3332
function()
3433
if not isElement(player) or getElementType(player) ~= 'player' then
3534
return
3635
end
36+
g_Players[playerID].doingclasssel = true
3737
killPed(player)
3838
if procCallOnAll('OnPlayerRequestClass', playerID, 0) then
3939
putPlayerInClassSelection(player)
@@ -181,11 +181,11 @@ function putPlayerInClassSelection(player)
181181
return
182182
end
183183
toggleAllControls(player, false, true, false)
184-
killPed(player)
185184
local playerID = getElemID(player)
186185
g_Players[playerID].viewingintro = nil
187186
g_Players[playerID].doingclasssel = true
188187
g_Players[playerID].selectedclass = g_Players[playerID].selectedclass or 0
188+
killPed(player)
189189
if g_Players[playerID].blip then
190190
setElementVisibleTo(g_Players[playerID].blip, root, false)
191191
end

0 commit comments

Comments
 (0)