From 9e31c3ebf53b6dd9b26c5187322b84a1ab2ac212 Mon Sep 17 00:00:00 2001
From: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
Date: Wed, 15 Sep 2021 18:41:08 -0400
Subject: [PATCH] Refactoring m_isDeactivating into m_isHierarchyEnabled

Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
---
 .../Components/NetworkHierarchyChildComponent.h    |  3 ++-
 .../Components/NetworkHierarchyRootComponent.h     |  5 +++--
 .../Components/NetworkHierarchyChildComponent.cpp  | 14 +++++++-------
 .../Components/NetworkHierarchyRootComponent.cpp   |  5 +++--
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Gems/Multiplayer/Code/Include/Multiplayer/Components/NetworkHierarchyChildComponent.h b/Gems/Multiplayer/Code/Include/Multiplayer/Components/NetworkHierarchyChildComponent.h
index 2effb18bb8..544fb3d6cb 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/Components/NetworkHierarchyChildComponent.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/Components/NetworkHierarchyChildComponent.h
@@ -78,7 +78,8 @@ namespace Multiplayer
         NetworkHierarchyChangedEvent m_networkHierarchyChangedEvent;
         NetworkHierarchyLeaveEvent m_networkHierarchyLeaveEvent;
 
-        bool m_isDeactivating = false;
+        //! Set to false when deactivating or otherwise not to be included in hierarchy considerations.
+        bool m_isHierarchyEnabled = true;
 
         void NotifyChildrenHierarchyDisbanded();
     };
diff --git a/Gems/Multiplayer/Code/Include/Multiplayer/Components/NetworkHierarchyRootComponent.h b/Gems/Multiplayer/Code/Include/Multiplayer/Components/NetworkHierarchyRootComponent.h
index 35f0da5965..4c9f94c004 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/Components/NetworkHierarchyRootComponent.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/Components/NetworkHierarchyRootComponent.h
@@ -93,7 +93,8 @@ namespace Multiplayer
         bool RecursiveAttachHierarchicalChild(AZ::EntityId entity, uint32_t& currentEntityCount);
 
         void SetRootForEntity(AZ::Entity* root, const AZ::Entity* childEntity);
-
-        bool m_isDeactivating = false;
+        
+        //! Set to false when deactivating or otherwise not to be included in hierarchy considerations.
+        bool m_isHierarchyEnabled = true;
     };
 }
diff --git a/Gems/Multiplayer/Code/Source/Components/NetworkHierarchyChildComponent.cpp b/Gems/Multiplayer/Code/Source/Components/NetworkHierarchyChildComponent.cpp
index eff051ed93..6ee407990e 100644
--- a/Gems/Multiplayer/Code/Source/Components/NetworkHierarchyChildComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/Components/NetworkHierarchyChildComponent.cpp
@@ -67,6 +67,8 @@ namespace Multiplayer
 
     void NetworkHierarchyChildComponent::OnActivate([[maybe_unused]] EntityIsMigrating entityIsMigrating)
     {
+        m_isHierarchyEnabled = true;
+
         HierarchyRootAddEvent(m_hierarchyRootNetIdChanged);
         NetworkHierarchyRequestBus::Handler::BusConnect(GetEntityId());
 
@@ -79,7 +81,7 @@ namespace Multiplayer
 
     void NetworkHierarchyChildComponent::OnDeactivate([[maybe_unused]] EntityIsMigrating entityIsMigrating)
     {
-        m_isDeactivating = true;
+        m_isHierarchyEnabled = false;
 
         if (m_rootEntity)
         {
@@ -96,7 +98,7 @@ namespace Multiplayer
 
     bool NetworkHierarchyChildComponent::IsHierarchyEnabled() const
     {
-        return !m_isDeactivating;
+        return m_isHierarchyEnabled;
     }
 
     bool NetworkHierarchyChildComponent::IsHierarchicalChild() const
@@ -197,11 +199,9 @@ namespace Multiplayer
         }
         else
         {
-            if (!m_rootEntity)
-            {
-                m_rootEntity = nullptr;
-                m_networkHierarchyLeaveEvent.Signal();
-            }
+            m_isHierarchyEnabled = false;
+            m_rootEntity = nullptr;
+            m_networkHierarchyLeaveEvent.Signal();
         }
     }
 
diff --git a/Gems/Multiplayer/Code/Source/Components/NetworkHierarchyRootComponent.cpp b/Gems/Multiplayer/Code/Source/Components/NetworkHierarchyRootComponent.cpp
index d2b45a8971..f704242f34 100644
--- a/Gems/Multiplayer/Code/Source/Components/NetworkHierarchyRootComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/Components/NetworkHierarchyRootComponent.cpp
@@ -71,6 +71,7 @@ namespace Multiplayer
 
     void NetworkHierarchyRootComponent::OnActivate([[maybe_unused]] Multiplayer::EntityIsMigrating entityIsMigrating)
     {
+        m_isHierarchyEnabled = true;
         m_hierarchicalEntities.push_back(GetEntity());
 
         NetworkHierarchyRequestBus::Handler::BusConnect(GetEntityId());
@@ -84,7 +85,7 @@ namespace Multiplayer
 
     void NetworkHierarchyRootComponent::OnDeactivate([[maybe_unused]] Multiplayer::EntityIsMigrating entityIsMigrating)
     {
-        m_isDeactivating = true;
+        m_isHierarchyEnabled = false;
 
         if (m_rootEntity)
         {
@@ -121,7 +122,7 @@ namespace Multiplayer
 
     bool NetworkHierarchyRootComponent::IsHierarchyEnabled() const
     {
-        return !m_isDeactivating;
+        return m_isHierarchyEnabled;
     }
 
     bool NetworkHierarchyRootComponent::IsHierarchicalRoot() const