Disabling problematic NetBindComponent assert with a configuration option.

Signed-off-by: Olex Lozitskiy <5432499+AMZN-Olex@users.noreply.github.com>
monroegm-disable-blank-issue-2
Olex Lozitskiy 4 years ago
parent 27abad7564
commit a2b7f90a78

@ -22,6 +22,9 @@
#include <AzCore/Serialization/EditContext.h> #include <AzCore/Serialization/EditContext.h>
#include <AzCore/std/sort.h> #include <AzCore/std/sort.h>
AZ_CVAR(bool, bg_AssertNetBindOnDeactrivationWithoutMarkForRemoval, false, nullptr, AZ::ConsoleFunctorFlags::Null,
"If true, assert when a multiplayer entity is deactivated without first calling MarkForRemoval from NetworkEntityManager.");
namespace Multiplayer namespace Multiplayer
{ {
void NetBindComponent::Reflect(AZ::ReflectContext* context) void NetBindComponent::Reflect(AZ::ReflectContext* context)
@ -167,10 +170,13 @@ namespace Multiplayer
void NetBindComponent::Deactivate() void NetBindComponent::Deactivate()
{ {
AZ_Assert( if (bg_AssertNetBindOnDeactrivationWithoutMarkForRemoval)
m_needsToBeStopped == false, {
"Entity (%s) appears to have been improperly deleted. Use MarkForRemoval to correctly clean up a networked entity.", AZ_Assert(
GetEntity() ? GetEntity()->GetName().c_str() : "null"); 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(); m_handleLocalServerRpcMessageEventHandle.Disconnect();
if (NetworkRoleHasController(m_netEntityRole)) if (NetworkRoleHasController(m_netEntityRole))
{ {

Loading…
Cancel
Save