From 59d0a8817e9122c5c8af1afd1cf8476b869d733b Mon Sep 17 00:00:00 2001
From: puvvadar <puvvadar@amazon.com>
Date: Tue, 8 Jun 2021 22:56:53 -0700
Subject: [PATCH] Fix inconsistent naming and cover edge case

---
 .../Source/ConnectionData/ClientToServerConnectionData.h    | 1 +
 .../Source/ConnectionData/ClientToServerConnectionData.inl  | 5 +++++
 .../Source/ConnectionData/ServerToClientConnectionData.h    | 4 ++--
 .../Source/ConnectionData/ServerToClientConnectionData.inl  | 6 +++---
 Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp | 5 +++++
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.h b/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.h
index 693e3814c4..e343bc6dfe 100644
--- a/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.h
+++ b/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.h
@@ -40,6 +40,7 @@ namespace Multiplayer
         //! @}
 
         const AZStd::string& GetProviderTicket() const;
+        void SetProviderTicket(const AZStd::string&);
 
     private:
         EntityReplicationManager m_entityReplicationManager;
diff --git a/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.inl b/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.inl
index 44cbf10350..a5982dcdb8 100644
--- a/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.inl
+++ b/Gems/Multiplayer/Code/Source/ConnectionData/ClientToServerConnectionData.inl
@@ -26,4 +26,9 @@ namespace Multiplayer
     {
         return m_providerTicket;
     }
+
+    inline void ClientToServerConnectionData::SetProviderTicket(const AZStd::string& ticket)
+    {
+        m_providerTicket = ticket;
+    }
 }
diff --git a/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.h b/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.h
index 0851299498..dda7c15d69 100644
--- a/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.h
+++ b/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.h
@@ -42,7 +42,7 @@ namespace Multiplayer
         NetworkEntityHandle GetPrimaryPlayerEntity();
         const NetworkEntityHandle& GetPrimaryPlayerEntity() const;
         const AZStd::string& GetProviderTicket() const;
-        void SetProviderTicket(AZStd::string);
+        void SetProviderTicket(const AZStd::string&);
 
     private:
         void OnControlledEntityRemove();
@@ -53,7 +53,7 @@ namespace Multiplayer
         NetworkEntityHandle m_controlledEntity;
         EntityStopEvent::Handler m_controlledEntityRemovedHandler;
         EntityServerMigrationEvent::Handler m_controlledEntityMigrationHandler;
-        AZStd::string m_ticket;
+        AZStd::string m_providerTicket;
         AzNetworking::IConnection* m_connection = nullptr;
         bool m_canSendUpdates = false;
     };
diff --git a/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.inl b/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.inl
index b56ed7097e..1fb104b311 100644
--- a/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.inl
+++ b/Gems/Multiplayer/Code/Source/ConnectionData/ServerToClientConnectionData.inl
@@ -35,11 +35,11 @@ namespace Multiplayer
 
     inline const AZStd::string& ServerToClientConnectionData::GetProviderTicket() const
     {
-        return m_ticket;
+        return m_providerTicket;
     }
 
-    inline void ServerToClientConnectionData::SetProviderTicket(AZStd::string ticket)
+    inline void ServerToClientConnectionData::SetProviderTicket(const AZStd::string& ticket)
     {
-        m_ticket = ticket;
+        m_providerTicket = ticket;
     }
 }
diff --git a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp
index a1e65aa392..e4256a875c 100644
--- a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp
@@ -208,6 +208,11 @@ namespace Multiplayer
         {
             connection->SetUserData(new ClientToServerConnectionData(connection, *this, config.m_playerSessionId));
         }
+        else
+        {
+            reinterpret_cast<ClientToServerConnectionData*>(connection->GetUserData())->SetProviderTicket(config.m_playerSessionId);
+        }
+
         return true;
     }