Fixed ctrl+g port number. Enabled server spawn for levels with no network entities since we can spawn net entities from the scripts

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

@@ -109,11 +109,7 @@ namespace Multiplayer
             AZ::Interface<IMultiplayer>::Get()->InitializeMultiplayer(MultiplayerAgentType::DedicatedServer);
             INetworkInterface* networkInterface = AZ::Interface<INetworking>::Get()->RetrieveNetworkInterface(AZ::Name(MPNetworkInterfaceName));
 
-            uint16_t serverPort = DefaultServerPort;
-            if (auto console = AZ::Interface<AZ::IConsole>::Get(); console)
-            {
-                console->GetCvarValue("sv_port", serverPort);
-            }
+            uint16_t serverPort = GetGameServerPort();
             networkInterface->Listen(serverPort);
 
             AZLOG_INFO("Editor Server completed asset receive, responding to Editor...");
@@ -138,18 +134,20 @@ namespace Multiplayer
             if (auto console = AZ::Interface<AZ::IConsole>::Get(); console)
             {
                 AZ::CVarFixedString remoteAddress;
-                uint16_t remotePort;
-                if (console->GetCvarValue("editorsv_serveraddr", remoteAddress) != AZ::GetValueResult::ConsoleVarNotFound &&
-                    console->GetCvarValue("editorsv_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));
-
-                        const IpAddress ipAddress(remoteAddress.c_str(), remotePort, networkInterface->GetType());
-                        networkInterface->Connect(ipAddress);
-                    }
+                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));
+
+                    // Connecting to DefaultServerPort here 
+                    const IpAddress ipAddress(remoteAddress.c_str(), remotePort, networkInterface->GetType());
+                    networkInterface->Connect(ipAddress);
+
+                    AZ::Interface<IMultiplayer>::Get()->SendReadyForEntityUpdates(true);
+                }
             }
         }
         return true;
@@ -184,4 +182,15 @@ 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;
+    }
+
 }

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

@@ -39,7 +39,8 @@ 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,6 +51,7 @@ namespace Multiplayer
         //! @}
 
     private:
+        uint16_t GetGameServerPort();
 
         AzNetworking::INetworkInterface* m_networkEditorInterface = nullptr;
         AZStd::vector<uint8_t> m_buffer;

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();