Skip to content

Commit aac8828

Browse files
committed
Change spawn logic, don't process spawns from gamemodeinit
1 parent 3dfdcd5 commit aac8828

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

amx/server/events.lua

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,20 @@ function gameModeInit(player)
5050
if not isElement(player) or getElementType(player) ~= 'player' then
5151
return
5252
end
53-
repeat until spawnPlayer(player, math.random(-20, 20), math.random(-20, 20), 3, math.random(0, 359), math.random(9, 288))
53+
repeat until onPlayerInitSpawnPlayer(player, math.random(-20, 20), math.random(-20, 20), 3, math.random(0, 359), math.random(9, 288))
5454
end,
5555
5000,
5656
1
5757
)
5858
end
5959
end
6060

61+
function onPlayerInitSpawnPlayer(player, x, y, z, rotation, skinid)
62+
local playerID = getElemID(player)
63+
g_Players[playerID].spawnedfromgamemodeinit = true
64+
return spawnPlayer(player, x, y, z, rotation, skinid)
65+
end
66+
6167
function joinHandler(player)
6268
local playerJoined = not player
6369
if playerJoined then
@@ -250,7 +256,7 @@ addEventHandler('onPlayerSpawn', root,
250256
function()
251257
local playerID = getElemID(source)
252258
local playerdata = g_Players[playerID]
253-
if playerdata.doingclasssel or playerdata.beingremovedfromvehicle then
259+
if playerdata.doingclasssel or playerdata.beingremovedfromvehicle or playerdata.spawnedfromgamemodeinit then
254260
return
255261
end
256262
toggleAllControls(source, true)

0 commit comments

Comments
 (0)