Merging latest main

2021-05-19 13:37:45 -07:00
parent 487e989e68 f779821ac0
commit 6a643392f0
934 changed files with 12574 additions and 31465 deletions
@@ -555,10 +555,10 @@ namespace Multiplayer
            {
                replicatorEntity = entityList[0];
            }
-            
-            AZ_Assert(replicatorEntity != nullptr, "Failed to create entity from prefab %s", prefabEntityId.m_prefabName.GetCStr());
-            if (replicatorEntity == nullptr)
+            else
            {
+                AZ_Assert(false, "There should be exactly one created entity out of prefab %s, index %d. Got: %d",
+                    prefabEntityId.m_prefabName.GetCStr(), prefabEntityId.m_entityOffset, entityList.size());
                return false;
            }
        }