Merged conflicts from pulling down latest development

Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 16:29:27 -05:00
parent 40f9761f86 e9dd032a75
commit f47e71da36
119 changed files with 1006 additions and 1506 deletions
@@ -812,6 +812,16 @@ namespace Multiplayer
        return &m_networkEntityManager;
    }

+    void MultiplayerSystemComponent::SetFilterEntityManager(IFilterEntityManager* entityFilter)
+    {
+        m_filterEntityManager = entityFilter;
+    }
+
+    IFilterEntityManager* MultiplayerSystemComponent::GetFilterEntityManager()
+    {
+        return m_filterEntityManager;
+    }
+
    void MultiplayerSystemComponent::DumpStats([[maybe_unused]] const AZ::ConsoleCommandContainer& arguments)
    {
        const MultiplayerStats& stats = GetStats();