From bffb7d1b2876633780c728969906c656f813105e Mon Sep 17 00:00:00 2001
From: pereslav <pereslav@amazon.com>
Date: Thu, 3 Jun 2021 01:20:22 +0100
Subject: [PATCH] Simplified the change to rely on sv_port cvar

---
 .../Editor/MultiplayerEditorConnection.cpp    | 41 ++++++++-----------
 .../Editor/MultiplayerEditorConnection.h      |  3 +-
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorConnection.cpp b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorConnection.cpp
index 710a051cd9..847d1caadf 100644
--- a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorConnection.cpp
+++ b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorConnection.cpp
@@ -109,7 +109,11 @@ namespace Multiplayer
             AZ::Interface<IMultiplayer>::Get()->InitializeMultiplayer(MultiplayerAgentType::DedicatedServer);
             INetworkInterface* networkInterface = AZ::Interface<INetworking>::Get()->RetrieveNetworkInterface(AZ::Name(MPNetworkInterfaceName));
 
-            uint16_t serverPort = GetGameServerPort();
+            uint16_t serverPort = DefaultServerPort;
+            if (auto console = AZ::Interface<AZ::IConsole>::Get(); console)
+            {
+                console->GetCvarValue("sv_port", serverPort);
+            }
             networkInterface->Listen(serverPort);
 
             AZLOG_INFO("Editor Server completed asset receive, responding to Editor...");
@@ -134,20 +138,20 @@ namespace Multiplayer
             if (auto console = AZ::Interface<AZ::IConsole>::Get(); console)
             {
                 AZ::CVarFixedString remoteAddress;
-                uint16_t remotePort = GetGameServerPort();
-                if (console->GetCvarValue("editorsv_serveraddr", remoteAddress) != AZ::GetValueResult::ConsoleVarNotFound)
-                {
-                    // Connect the Editor to the editor server for Multiplayer simulation
-                    AZ::Interface<IMultiplayer>::Get()->InitializeMultiplayer(MultiplayerAgentType::Client);
-                    INetworkInterface* networkInterface =
-                        AZ::Interface<INetworking>::Get()->RetrieveNetworkInterface(AZ::Name(MPNetworkInterfaceName));
+                uint16_t remotePort;
+                if (console->GetCvarValue("editorsv_serveraddr", remoteAddress) != AZ::GetValueResult::ConsoleVarNotFound &&
+                    console->GetCvarValue("sv_port", remotePort) != AZ::GetValueResult::ConsoleVarNotFound)
+                    {
+                        // Connect the Editor to the editor server for Multiplayer simulation
+                        AZ::Interface<IMultiplayer>::Get()->InitializeMultiplayer(MultiplayerAgentType::Client);
+                        INetworkInterface* networkInterface =
+                            AZ::Interface<INetworking>::Get()->RetrieveNetworkInterface(AZ::Name(MPNetworkInterfaceName));
 
-                    // Connecting to DefaultServerPort here 
-                    const IpAddress ipAddress(remoteAddress.c_str(), remotePort, networkInterface->GetType());
-                    networkInterface->Connect(ipAddress);
+                        const IpAddress ipAddress(remoteAddress.c_str(), remotePort, networkInterface->GetType());
+                        networkInterface->Connect(ipAddress);
 
-                    AZ::Interface<IMultiplayer>::Get()->SendReadyForEntityUpdates(true);
-                }
+                        AZ::Interface<IMultiplayer>::Get()->SendReadyForEntityUpdates(true);
+                    }
             }
         }
         return true;
@@ -182,15 +186,4 @@ namespace Multiplayer
     {
         ;
     }
-
-    uint16_t MultiplayerEditorConnection::GetGameServerPort()
-    {
-        uint16_t serverPort = DefaultServerPort;
-        if (auto console = AZ::Interface<AZ::IConsole>::Get(); console)
-        {
-            console->GetCvarValue("sv_port", serverPort);
-        }
-        return serverPort;
-    }
-
 }
diff --git a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorConnection.h b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorConnection.h
index 40eb38af1d..d803a60744 100644
--- a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorConnection.h
+++ b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorConnection.h
@@ -39,7 +39,7 @@ namespace Multiplayer
 
         bool HandleRequest(AzNetworking::IConnection* connection, const AzNetworking::IPacketHeader& packetHeader, MultiplayerEditorPackets::EditorServerInit& packet);
         bool HandleRequest(AzNetworking::IConnection* connection, const AzNetworking::IPacketHeader& packetHeader, MultiplayerEditorPackets::EditorServerReady& packet);
-
+        
         //! IConnectionListener interface
         //! @{
         AzNetworking::ConnectResult ValidateConnect(const AzNetworking::IpAddress& remoteAddress, const AzNetworking::IPacketHeader& packetHeader, AzNetworking::ISerializer& serializer) override;
@@ -50,7 +50,6 @@ namespace Multiplayer
         //! @}
 
     private:
-        uint16_t GetGameServerPort();
 
         AzNetworking::INetworkInterface* m_networkEditorInterface = nullptr;
         AZStd::vector<uint8_t> m_buffer;