Merge remote-tracking branch 'origin' into MultiplayerComponents

2021-06-02 14:57:00 -07:00
parent b013d7ac67 d697fbe366
commit 14bc0ba8ac
640 changed files with 17532 additions and 12712 deletions
@@ -402,8 +402,12 @@ namespace Multiplayer
        const AZ::Transform& transform
    )
    {
-        INetworkEntityManager::EntityList returnList;
-
+        EntityList returnList;
+        if (!AZ::Data::AssetManager::IsReady())
+        {
+            return returnList;
+        }
+        
        auto spawnableAssetId = m_networkPrefabLibrary.GetAssetIdByName(prefabEntryId.m_prefabName);
        // Required for sync-instantiation. Todo: keep the reference in NetworkSpawnableLibrary
        auto netSpawnableAsset = AZ::Data::AssetManager::Instance().GetAsset<AzFramework::Spawnable>(spawnableAssetId, AZ::Data::AssetLoadBehavior::PreLoad);