Correction in set hierarchy entity logic.

Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>

Gems/Multiplayer/Code/Source/Components/NetworkHierarchyChildComponent.cpp

@@ -148,9 +148,7 @@ namespace Multiplayer
                 m_networkHierarchyChangedEvent.Signal(m_rootEntity->GetId());
             }
         }
-        else
-        {
-            if (m_rootEntity == previousHierarchyRoot || !previousHierarchyRoot)
+        else if ((previousHierarchyRoot && m_rootEntity == previousHierarchyRoot) || !previousHierarchyRoot)
         {
             m_rootEntity = nullptr;
 
@@ -167,8 +165,6 @@ namespace Multiplayer
         }
     }
 
-    }
-
     void NetworkHierarchyChildComponent::SetOwningConnectionId(AzNetworking::ConnectionId connectionId)
     {
         NetworkHierarchyChildComponentBase::SetOwningConnectionId(connectionId);

Gems/Multiplayer/Code/Source/Components/NetworkHierarchyRootComponent.cpp

@@ -324,39 +324,39 @@ namespace Multiplayer
     void NetworkHierarchyRootComponent::SetTopLevelHierarchyRootEntity(AZ::Entity* previousHierarchyRoot, AZ::Entity* newHierarchyRoot)
     {
         if (newHierarchyRoot)
+        {
+            if (m_rootEntity != newHierarchyRoot)
             {
                 m_rootEntity = newHierarchyRoot;
 
                 if (HasController() && GetNetBindComponent()->GetNetEntityRole() == NetEntityRole::Authority)
                 {
-                NetworkHierarchyChildComponentController* controller = static_cast<NetworkHierarchyChildComponentController*>(GetController());
-
+                    NetworkHierarchyRootComponentController* controller = static_cast<NetworkHierarchyRootComponentController*>(GetController());
                     const NetEntityId netRootId = GetNetworkEntityManager()->GetNetEntityIdById(m_rootEntity->GetId());
                     controller->SetHierarchyRoot(netRootId);
                 }
 
                 GetNetBindComponent()->SetOwningConnectionId(m_rootEntity->FindComponent<NetBindComponent>()->GetOwningConnectionId());
+                m_networkHierarchyChangedEvent.Signal(m_rootEntity->GetId());
             }
-        else
-        {
-            if (previousHierarchyRoot && m_rootEntity == previousHierarchyRoot || !previousHierarchyRoot)
+        }
+        else if ((previousHierarchyRoot && m_rootEntity == previousHierarchyRoot) || !previousHierarchyRoot)
         {
             m_rootEntity = nullptr;
 
             if (HasController() && GetNetBindComponent()->GetNetEntityRole() == NetEntityRole::Authority)
             {
-                    NetworkHierarchyChildComponentController* controller = static_cast<NetworkHierarchyChildComponentController*>(GetController());
-
+                NetworkHierarchyRootComponentController* controller = static_cast<NetworkHierarchyRootComponentController*>(GetController());
                 controller->SetHierarchyRoot(InvalidNetEntityId);
             }
 
             GetNetBindComponent()->SetOwningConnectionId(m_previousOwningConnectionId);
+            m_networkHierarchyLeaveEvent.Signal();
 
             // We lost the parent hierarchical entity, so as a root we need to re-build our own hierarchy.
             RebuildHierarchy();
         }
     }
-    }
 
     void NetworkHierarchyRootComponent::SetOwningConnectionId(AzNetworking::ConnectionId connectionId)
     {