From f49e5cf64549f45168044655237f262acbffa304 Mon Sep 17 00:00:00 2001 From: puvvadar Date: Mon, 21 Jun 2021 14:49:49 -0700 Subject: [PATCH] Validate some base cases in InitializeMultiplayer --- .../Code/Source/MultiplayerSystemComponent.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp index 32d8cfa600..c2ff0a58a6 100644 --- a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp +++ b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp @@ -714,6 +714,17 @@ namespace Multiplayer void MultiplayerSystemComponent::InitializeMultiplayer(MultiplayerAgentType multiplayerType) { + if (m_agentType == multiplayerType) + { + // No-op + return; + } + + if (m_agentType != MultiplayerAgentType::Uninitialized && multiplayerType != MultiplayerAgentType::Uninitialized) + { + AZLOG_WARN("Attemping to InitializeMultiplayer from one initialized type to another. Your session may not have been properly torn down."); + } + if (m_agentType == MultiplayerAgentType::Uninitialized) { if (multiplayerType == MultiplayerAgentType::ClientServer || multiplayerType == MultiplayerAgentType::DedicatedServer)