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

Use emitter.emit() in server/sys/msg/register

Browse Source
This commit is contained in:
juliancoffee 2021-07-29 20:11:39 +03:00
parent 229e7b9cec
commit 9300353c98
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/src/sys/msg/register.rs
View File

@ -75,6 +75,7 @@ impl<'a> System<'a> for Sys {
mut login_provider,
): Self::SystemData,
) {
let mut server_emitter = read_data.server_event_bus.emitter();
// Player list to send new players.
let player_list = (
&read_data.uids,
@ -138,12 +139,10 @@ impl<'a> System<'a> for Sys {
trace!(?r, "pending login returned");
match r {
Err(e) => {
read_data
.server_event_bus
.emit_now(ServerEvent::ClientDisconnect(
entity,
common::comp::DisconnectReason::Kicked,
));
server_emitter.emit(ServerEvent::ClientDisconnect(
entity,
common::comp::DisconnectReason::Kicked,
));
client.send(ServerRegisterAnswer::Err(e))?;
return Ok(());
},
@ -159,12 +158,10 @@ impl<'a> System<'a> for Sys {
.find(|(_, _, old_player)| old_player.uuid() == uuid)
{
// Remove old client
read_data
.server_event_bus
.emit_now(ServerEvent::ClientDisconnect(
old_entity,
common::comp::DisconnectReason::NewerLogin,
));
server_emitter.emit(ServerEvent::ClientDisconnect(
old_entity,
common::comp::DisconnectReason::NewerLogin,
));
let _ = old_client.send(ServerGeneral::Disconnect(DisconnectReason::Kicked(
String::from("You have logged in from another location."),
)));