Merge pull request #744 from fivemland/fix-736

fix(esx_banking): issue #736

[esx_addons]/esx_banking/client/main.lua

@@ -197,11 +197,14 @@ RegisterNetEvent('esx_banking:closebanking', function()
     CloseUi()
 end)
 
-RegisterNetEvent('esx_banking:PedHandler', function(netIdTable)
+local function loadNPC(index, netID)
-    local npc
+    CreateThread(function()
-    for i = 1, #netIdTable do
+        while not NetworkDoesEntityExistWithNetworkId(netID) do
-        npc = NetworkGetEntityFromNetworkId(netIdTable[i])
+            Wait(1)
-        TaskStartScenarioInPlace(npc, Config.Peds[i].Scenario, 0, true)
+        end
+        local npc = NetworkGetEntityFromNetworkId(netID)
+        
+        TaskStartScenarioInPlace(npc, Config.Peds[index].Scenario, 0, true)
         SetEntityProofs(npc, true, true, true, true, true, true, true, true)
         SetBlockingOfNonTemporaryEvents(npc, true)
         FreezeEntityPosition(npc, true)
@@ -209,6 +212,12 @@ RegisterNetEvent('esx_banking:PedHandler', function(netIdTable)
         SetPedCanRagdoll(npc, false)
         SetEntityAsMissionEntity(npc, true, true)
         SetEntityDynamic(npc, false)
+    end)
+end
+
+RegisterNetEvent('esx_banking:PedHandler', function(netIdTable)
+    for i = 1, #netIdTable do
+        loadNPC(i, netIdTable[i])
     end
 end)
 

[esx_addons]/esx_banking/server/main.lua

@@ -22,10 +22,11 @@ AddEventHandler('onResourceStop', function(resourceName)
     if Config.EnablePeds then BANK.DeletePeds() end
 end)
 
-AddEventHandler('esx:playerLoaded', function(playerId, xPlayer)
+if Config.EnablePeds then
-    if not Config.EnablePeds then return end
+    AddEventHandler('esx:playerLoaded', function(playerId)
-	TriggerClientEvent('esx_banking:PedHandler', playerId, netIdTable)
+        TriggerClientEvent('esx_banking:PedHandler', playerId, netIdTable)
-end)
+    end)
+end
 
 -- event
 RegisterServerEvent('esx_banking:doingType')