From 95d7cc72123cd4802f232108da791f3d39784266 Mon Sep 17 00:00:00 2001
From: kberg-amzn <karlberg@amazon.com>
Date: Mon, 27 Sep 2021 12:14:41 -0700
Subject: [PATCH] Adding the NetworkConnectionComponent to hold user nonce and
 migration values for a backup host in case the current host crashes or
 abnormally disconnects

Signed-off-by: kberg-amzn <karlberg@amazon.com>
---
 .../NetworkConnectionComponent.AutoComponent.xml   | 14 ++++++++++++++
 .../Source/NetworkEntity/NetworkEntityManager.cpp  |  1 -
 Gems/Multiplayer/Code/multiplayer_files.cmake      |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 Gems/Multiplayer/Code/Source/AutoGen/NetworkConnectionComponent.AutoComponent.xml

diff --git a/Gems/Multiplayer/Code/Source/AutoGen/NetworkConnectionComponent.AutoComponent.xml b/Gems/Multiplayer/Code/Source/AutoGen/NetworkConnectionComponent.AutoComponent.xml
new file mode 100644
index 0000000000..eff1b5e9cf
--- /dev/null
+++ b/Gems/Multiplayer/Code/Source/AutoGen/NetworkConnectionComponent.AutoComponent.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+
+<Component
+    Name="NetworkConnectionComponent"
+    Namespace="Multiplayer"
+    OverrideComponent="false"
+    OverrideController="false"
+    OverrideInclude=""
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+	<NetworkProperty Type="uint64_t"    Name="UserIdentifier"   Init="0"                  ReplicateFrom="Authority" ReplicateTo="Client" IsRewindable="false" IsPredictable="false" IsPublic="true" Container="Object" ExposeToEditor="false" ExposeToScript="false" GenerateEventBindings="false" />
+	<NetworkProperty Type="HostId"      Name="MigrationHostId"  Init="InvalidHostId"      ReplicateFrom="Authority" ReplicateTo="Client" IsRewindable="false" IsPredictable="false" IsPublic="true" Container="Object" ExposeToEditor="false" ExposeToScript="false" GenerateEventBindings="false" />
+	<NetworkProperty Type="NetEntityId" Name="ControlledEntity" Init="InvalidNetEntityId" ReplicateFrom="Authority" ReplicateTo="Server" IsRewindable="false" IsPredictable="false" IsPublic="true" Container="Object" ExposeToEditor="false" ExposeToScript="false" GenerateEventBindings="false" />
+</Component>
diff --git a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.cpp b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.cpp
index 1ed2c8f6a4..68c87d1c6d 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkEntityManager.cpp
@@ -374,7 +374,6 @@ namespace Multiplayer
                     &AzFramework::GameEntityContextRequestBus::Events::AddGameEntity, clone);
 
                 returnList.push_back(netBindComponent->GetEntityHandle());
-
             }
             else
             {
diff --git a/Gems/Multiplayer/Code/multiplayer_files.cmake b/Gems/Multiplayer/Code/multiplayer_files.cmake
index c1d27402f5..51a5a1754d 100644
--- a/Gems/Multiplayer/Code/multiplayer_files.cmake
+++ b/Gems/Multiplayer/Code/multiplayer_files.cmake
@@ -58,6 +58,7 @@ set(FILES
     Source/AutoGen/Multiplayer.AutoPackets.xml
     Source/AutoGen/MultiplayerEditor.AutoPackets.xml
     Source/AutoGen/NetworkCharacterComponent.AutoComponent.xml
+    Source/AutoGen/NetworkConnectionComponent.AutoComponent.xml
     Source/AutoGen/NetworkHitVolumesComponent.AutoComponent.xml
     Source/AutoGen/NetworkRigidBodyComponent.AutoComponent.xml
     Source/AutoGen/NetworkTransformComponent.AutoComponent.xml