aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenauxg <19689618+Henauxg@users.noreply.github.com>2022-10-25 18:19:14 +0200
committerHenauxg <19689618+Henauxg@users.noreply.github.com>2022-10-25 18:19:14 +0200
commitaf35130231265b5d54a64434e05779cb1936816c (patch)
tree75c414a9745f4280ebec2a1d51463b50dbf62ded
parentfabb2d000bd870bd8cf02bafe7d773f2ac750462 (diff)
[server] Rename DisconnectionEvent to ConnectionLostEvent for clarity
-rw-r--r--examples/chat_server/main.rs8
-rw-r--r--src/server.rs10
2 files changed, 9 insertions, 9 deletions
diff --git a/examples/chat_server/main.rs b/examples/chat_server/main.rs
index dee89ab..58bf17c 100644
--- a/examples/chat_server/main.rs
+++ b/examples/chat_server/main.rs
@@ -2,7 +2,7 @@ use std::collections::HashMap;
use bevy::{app::ScheduleRunnerPlugin, log::LogPlugin, prelude::*};
use bevy_quinnet::{
- server::{DisconnectionEvent, QuinnetServerPlugin, Server, ServerConfigurationData},
+ server::{ConnectionLostEvent, QuinnetServerPlugin, Server, ServerConfigurationData},
ClientId,
};
@@ -78,12 +78,12 @@ fn handle_client_messages(mut server: ResMut<Server>, mut users: ResMut<Users>)
}
fn handle_server_events(
- mut disconnections: EventReader<DisconnectionEvent>,
+ mut connection_lost_events: EventReader<ConnectionLostEvent>,
mut server: ResMut<Server>,
mut users: ResMut<Users>,
) {
- // The server signals us about users that disconnected (connection lost)
- for client in disconnections.iter() {
+ // The server signals us about users that lost connection
+ for client in connection_lost_events.iter() {
handle_disconnect(&mut server, &mut users, client.id);
}
}
diff --git a/src/server.rs b/src/server.rs
index 0c80ba2..964bd0a 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -35,8 +35,8 @@ pub const DEFAULT_INTERNAL_MESSAGE_CHANNEL_SIZE: usize = 100;
/// Connection event raised when a client just connected to the server. Raised in the CoreStage::PreUpdate stage.
pub struct ConnectionEvent { pub id: ClientId }
-/// Disconnection event raised when a client just disconnected from the server. Raised in the CoreStage::PreUpdate stage. This is not an "app" level disconnection, but rather a connection lost.
-pub struct DisconnectionEvent { pub id: ClientId }
+/// ConnectionLost event raised when a client is considered disconnected from the server. Raised in the CoreStage::PreUpdate stage.
+pub struct ConnectionLostEvent { pub id: ClientId }
#[derive(Debug)]
pub(crate) enum InternalAsyncMessage {
@@ -366,7 +366,7 @@ fn start_server(
fn update_sync_server(
mut server: ResMut<Server>,
mut connection_events: EventWriter<ConnectionEvent>,
- mut disconnection_events: EventWriter<DisconnectionEvent>
+ mut connection_lost_events: EventWriter<ConnectionLostEvent>
) {
while let Ok(message) = server.internal_receiver.try_recv() {
match message {
@@ -378,7 +378,7 @@ fn update_sync_server(
}
InternalAsyncMessage::ClientDisconnected(client_id) => {
server.clients.remove(&client_id);
- disconnection_events.send(DisconnectionEvent { id: client_id });
+ connection_lost_events.send(ConnectionLostEvent { id: client_id });
},
}
}
@@ -401,7 +401,7 @@ impl Plugin for QuinnetServerPlugin {
.unwrap(),
)
.add_event::<ConnectionEvent>()
- .add_event::<DisconnectionEvent>()
+ .add_event::<ConnectionLostEvent>()
.add_startup_system_to_stage(StartupStage::PreStartup, start_server)
.add_system_to_stage(CoreStage::PreUpdate,update_sync_server);
}