Merge pull request #1102 from aws-lumberyard-dev/MultiplayerPipeline

Fixed ctrl+g port number

Code/Framework/AzNetworking/AzNetworking/Utilities/TimedThread.cpp

@@ -46,7 +46,7 @@ namespace AzNetworking
                 }
                 else if (m_updateRate < updateTimeMs)
                 {
-                    AZLOG_INFO("TimedThread bled %d ms", aznumeric_cast<int32_t>(updateTimeMs - m_updateRate));
+                    AZLOG(NET_TimedThread, "TimedThread bled %d ms", aznumeric_cast<int32_t>(updateTimeMs - m_updateRate));
                 }
             }
             OnStop();

Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorConnection.cpp

@@ -140,7 +140,7 @@ namespace Multiplayer
                 AZ::CVarFixedString remoteAddress;
                 uint16_t remotePort;
                 if (console->GetCvarValue("editorsv_serveraddr", remoteAddress) != AZ::GetValueResult::ConsoleVarNotFound &&
-                    console->GetCvarValue("editorsv_port", remotePort) != 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);
@@ -149,6 +149,8 @@ namespace Multiplayer
 
                         const IpAddress ipAddress(remoteAddress.c_str(), remotePort, networkInterface->GetType());
                         networkInterface->Connect(ipAddress);
+
+                        AZ::Interface<IMultiplayer>::Get()->SendReadyForEntityUpdates(true);
                     }
             }
         }

Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp

@@ -165,7 +165,7 @@ namespace Multiplayer
 
         // BeginGameMode and Prefab Processing have completed at this point
         IMultiplayerTools* mpTools = AZ::Interface<IMultiplayerTools>::Get();
-        if (editorsv_enabled && mpTools != nullptr && mpTools->DidProcessNetworkPrefabs())
+        if (editorsv_enabled && mpTools != nullptr)
         {
             const AZStd::vector<AZ::Data::Asset<AZ::Data::AssetData>>& assetData = prefabEditorEntityOwnershipInterface->GetPlayInEditorAssetData();