Merge pull request #105 from ESX-Org/master

Make spawnmanager exports available synchronously

resources/[gameplay]/playernames/playernames_cl.lua

@@ -46,9 +46,9 @@ function updatePlayerNames()
     local localCoords = GetEntityCoords(PlayerPedId())
 
     -- for each valid player index
-    for i = 0, 255 do
+    for _, i in ipairs(GetActivePlayers()) do
         -- if the player exists
-        if NetworkIsPlayerActive(i) and i ~= PlayerId() then
+        if i ~= PlayerId() then
             -- get their ped
             local ped = GetPlayerPed(i)
             local pedCoords = GetEntityCoords(ped)
@@ -188,4 +188,4 @@ SetTimeout(0, function()
 end)
 
 -- run this function every frame
-SetTimeout(0, updatePlayerNames)
+SetTimeout(0, updatePlayerNames)

resources/[gameplay]/playernames/playernames_sv.lua

@@ -1,6 +1,8 @@
 local curTemplate
 local curTags = {}
 
+local activePlayers = {}
+
 local function detectUpdates()
     SetTimeout(500, detectUpdates)
 
@@ -14,23 +16,31 @@ local function detectUpdates()
 
     template = GetConvar('playerNames_svTemplate', '[{{id}}] {{name}}')
 
-    for _, v in ipairs(GetPlayers()) do
+    for v, _ in pairs(activePlayers) do
         local newTag = formatPlayerNameTag(v, template)
-
         if newTag ~= curTags[v] then
             setName(v, newTag)
-
+            
             curTags[v] = newTag
         end
     end
+
+    for i, tag in pairs(curTags) do
+        if not activePlayers[i] then
+            curTags[i] = nil -- in case curTags doesnt get cleared when the player left, clear it now.
+        end
+    end
 end
 
-
+AddEventHandler('playerDropped', function()
+    curTags[source] = nil
+    activePlayers[source] = nil
+end)
 
 RegisterNetEvent('playernames:init')
 AddEventHandler('playernames:init', function()
     reconfigure(source)
+    activePlayers[source] = true
 end)
 
-SetTimeout(500, detectUpdates)
+detectUpdates()
-detectUpdates()

resources/[managers]/spawnmanager/fxmanifest.lua

@@ -1,14 +1,5 @@
 client_script 'spawnmanager.lua'
 
-export 'getRandomSpawnPoint'
-export 'spawnPlayer'
-export 'addSpawnPoint'
-export 'removeSpawnPoint'
-export 'loadSpawns'
-export 'setAutoSpawn'
-export 'setAutoSpawnCallback'
-export 'forceRespawn'
-
 fx_version 'adamant'
 games { 'rdr3', 'gta5' }
 

resources/[managers]/spawnmanager/spawnmanager.lua

@@ -369,3 +369,11 @@ function forceRespawn()
     spawnLock = false
     respawnForced = true
 end
+
+exports('spawnPlayer', spawnPlayer)
+exports('addSpawnPoint', addSpawnPoint)
+exports('removeSpawnPoint', removeSpawnPoint)
+exports('loadSpawns', loadSpawns)
+exports('setAutoSpawn', setAutoSpawn)
+exports('setAutoSpawnCallback', setAutoSpawnCallback)
+exports('forceRespawn', forceRespawn)