Merging latest development

Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-09-27 15:50:22 -07:00
parent 95d7cc7212 527508ce66
commit 0a829f9661
482 changed files with 10637 additions and 2735 deletions
@@ -750,8 +750,10 @@ namespace Multiplayer

        if (m_agentType == MultiplayerAgentType::Uninitialized)
        {
+            m_spawnNetboundEntities = false;
            if (multiplayerType == MultiplayerAgentType::ClientServer || multiplayerType == MultiplayerAgentType::DedicatedServer)
            {
+                m_spawnNetboundEntities = true;
                m_initEvent.Signal(m_networkInterface);

                if (!m_networkEntityManager.IsInitialized())
@@ -867,6 +869,16 @@ namespace Multiplayer
        return m_filterEntityManager;
    }

+    void MultiplayerSystemComponent::SetShouldSpawnNetworkEntities(bool value)
+    {
+        m_spawnNetboundEntities = value;
+    }
+
+    bool MultiplayerSystemComponent::GetShouldSpawnNetworkEntities() const
+    {
+        return m_spawnNetboundEntities;
+    }
+
    void MultiplayerSystemComponent::DumpStats([[maybe_unused]] const AZ::ConsoleCommandContainer& arguments)
    {
        const MultiplayerStats& stats = GetStats();