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

Merge branch 'songtronix/fix-517' into 'master'

Browse Source 
fix #517

Closes #517

See merge request veloren/veloren!842
This commit is contained in:
Imbris 2020-03-09 23:25:04 +00:00
commit 5598fe7166
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/events/player.rs
View File

@ -1,7 +1,8 @@
use super::Event;
use crate::{client::Client, Server, StateExt};
use crate::{auth_provider::AuthProvider, client::Client, Server, StateExt};
use common::{
comp,
comp::Player,
msg::{ClientState, PlayerListUpdate, ServerMsg},
sync::{Uid, UidAllocator},
};
@ -51,6 +52,15 @@ pub fn handle_client_disconnect(server: &mut Server, entity: EcsEntity) -> Event
)))
}
// Make sure to remove the player from the logged in list. (See AuthProvider)
{
let players = state.ecs().read_storage::<Player>();
let mut accounts = state.ecs().write_resource::<AuthProvider>();
if let Some(player) = players.get(entity) {
accounts.logout(player.uuid());
}
}
// Delete client entity
if let Err(err) = state.delete_entity_recorded(entity) {
error!("Failed to delete disconnected client: {:?}", err);

1
server/src/sys/message.rs
View File

@ -300,7 +300,6 @@ impl<'a> System<'a> for Sys {
None,
ServerMsg::broadcast(format!("{} went offline.", &player.alias)),
));
accounts.logout(player.uuid());
}
server_emitter.emit(ServerEvent::ClientDisconnect(entity));
client.postbox.send_message(ServerMsg::Disconnect);