From aeab2edc5cb98ba1991f99b911462f40cf7b7e9e Mon Sep 17 00:00:00 2001 From: guava Date: Sun, 30 Apr 2017 08:41:06 +0200 Subject: [PATCH] spawnmanager: wait for collision --- .../[system]/spawnmanager/spawnmanager.lua | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/resources/[system]/spawnmanager/spawnmanager.lua b/resources/[system]/spawnmanager/spawnmanager.lua index 3b5a934..d06965e 100644 --- a/resources/[system]/spawnmanager/spawnmanager.lua +++ b/resources/[system]/spawnmanager/spawnmanager.lua @@ -270,6 +270,10 @@ function spawnPlayer(spawnIdx, cb) --loadScene(spawn.x, spawn.y, spawn.z) --ForceLoadingScreen(false) + while not HasCollisionLoadedAroundEntity(ped) do + Citizen.Wait(0) + end + ShutdownLoadingScreen() DoScreenFadeIn(500) @@ -334,17 +338,4 @@ end) function forceRespawn() spawnLock = false respawnForced = true -end - ---[[AddEventHandler('playerInfoCreated', function() - loadSpawns(json.encode({ - spawns = { - { x = -238.511, y = 954.025, z = 11.0803, heading = 90.0, model = 'ig_brucie' }, - { x = -310.001, y = 945.603, z = 14.3728, heading = 90.0, model = 'ig_bulgarin' }, - } - })) -end) - -AddEventHandler('playerActivated', function() - respawnForced = true -end)]] +end \ No newline at end of file