Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix #46 🥳

Browse Source
This commit is contained in:
Marcel Märtens
2021-03-03 12:36:44 +01:00
parent 9028578bc8
commit a55ec20c74
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/src/lib.rs
View File

@ -383,6 +383,7 @@ impl Server {
.await .await
}); });
runtime.block_on(network.listen(ProtocolAddr::Tcp(settings.gameserver_address)))?; runtime.block_on(network.listen(ProtocolAddr::Tcp(settings.gameserver_address)))?;
runtime.block_on(network.listen(ProtocolAddr::Mpsc(14004)))?;
let connection_handler = ConnectionHandler::new(network, &runtime); let connection_handler = ConnectionHandler::new(network, &runtime);
// Initiate real-time world simulation // Initiate real-time world simulation

5
voxygen/src/menu/main/mod.rs
View File

@ -69,16 +69,13 @@ impl PlayState for MainMenuState {
if let Some(singleplayer) = &global_state.singleplayer { if let Some(singleplayer) = &global_state.singleplayer {
match singleplayer.receiver.try_recv() { match singleplayer.receiver.try_recv() {
Ok(Ok(runtime)) => { Ok(Ok(runtime)) => {
let server_settings = singleplayer.settings();
// Attempt login after the server is finished initializing // Attempt login after the server is finished initializing
attempt_login( attempt_login(
&mut global_state.settings, &mut global_state.settings,
&mut global_state.info_message, &mut global_state.info_message,
"singleplayer".to_owned(), "singleplayer".to_owned(),
"".to_owned(), "".to_owned(),
ClientConnArgs::Resolved(ConnectionArgs::IpAndPort(vec![ ClientConnArgs::Resolved(ConnectionArgs::Mpsc(14004)),
server_settings.gameserver_address,
])),
&mut self.client_init, &mut self.client_init,
Some(runtime), Some(runtime),
); );