From b19f96f1fe44a4f77fc15089a2c4bf64394af369 Mon Sep 17 00:00:00 2001 From: Gene Walters Date: Mon, 6 Dec 2021 09:53:41 -0800 Subject: [PATCH] Small safety check. It's unlikely, but possible, that a component is created and not assigned to an entity. Signed-off-by: Gene Walters --- Gems/Multiplayer/Code/Source/Components/NetBindComponent.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Gems/Multiplayer/Code/Source/Components/NetBindComponent.cpp b/Gems/Multiplayer/Code/Source/Components/NetBindComponent.cpp index 72226d8740..e7cf297f1e 100644 --- a/Gems/Multiplayer/Code/Source/Components/NetBindComponent.cpp +++ b/Gems/Multiplayer/Code/Source/Components/NetBindComponent.cpp @@ -167,7 +167,10 @@ namespace Multiplayer void NetBindComponent::Deactivate() { - AZ_Assert(m_needsToBeStopped == false, "Entity (%s) appears to have been improperly deleted. Use MarkForRemoval to correctly clean up a networked entity.", GetEntity()->GetName().c_str()); + AZ_Assert( + m_needsToBeStopped == false, + "Entity (%s) appears to have been improperly deleted. Use MarkForRemoval to correctly clean up a networked entity.", + GetEntity() ? GetEntity()->GetName().c_str() : "null"); m_handleLocalServerRpcMessageEventHandle.Disconnect(); if (NetworkRoleHasController(m_netEntityRole)) {