Merge branch 'newport' into 'master'

Change default port of veloren from 59003 to 14004

See merge request veloren/veloren!346
This commit is contained in:
Marcel 2019-07-20 12:12:03 +00:00
commit aaeb20be42
3 changed files with 3 additions and 3 deletions

View File

@ -17,7 +17,7 @@ pub struct ServerSettings {
impl Default for ServerSettings {
fn default() -> Self {
Self {
address: SocketAddr::from(([0; 4], 59003)),
address: SocketAddr::from(([0; 4], 14004)),
world_seed: 1337,
server_name: "Server name".to_owned(),
server_description: "This is the best Veloren server.".to_owned(),

View File

@ -24,7 +24,7 @@ impl MainMenuState {
}
}
const DEFAULT_PORT: u16 = 59003;
const DEFAULT_PORT: u16 = 14004;
impl PlayState for MainMenuState {
fn play(&mut self, _: Direction, global_state: &mut GlobalState) -> PlayStateResult {

View File

@ -101,7 +101,7 @@ impl Default for NetworkingSettings {
fn default() -> Self {
Self {
username: "Username".to_string(),
servers: vec!["server.veloren.net:38889".to_string()],
servers: vec!["server.veloren.net".to_string()],
default_server: 0,
}
}