BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2026-04-04 23:06:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

to broadcast

Browse Source
This commit is contained in:
Lambdax
2023-11-23 09:44:49 +01:00
parent 7eaa382f6c
commit 478bf48a5a
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/server/mod.rs
View File

@@ -507,12 +507,9 @@ impl Server {
}
info!("Disconnecting client {}...", id);
for client in &self.clients {
if client.id == i as u8 {continue}
client.queue_packet(Packet::Notification(NotificationPacket::left(
self.clients[i].info.as_ref().unwrap().username.clone()
))).await;
}
self.broadcast(Packet::Notification(NotificationPacket::player_left( // broadcast left message
self.clients[i].info.as_ref().unwrap().username.clone()
)), Some(i as u8)).await;
if i == self.clients.len() - 1 {
self.clients.remove(i);
@@ -810,12 +807,9 @@ impl Server {
))))
.await;
for client in &self.clients { // welcome the player
if client.id == client_idx as u8 {continue}
client.queue_packet(Packet::Notification(NotificationPacket::welcome(
self.clients[client_idx].info.as_ref().unwrap().username.clone()
))).await;
}
self.broadcast(Packet::Notification(NotificationPacket::player_welcome( // welcome the player
self.clients[client_idx].info.as_ref().unwrap().username.clone()
)), Some(client_idx as u8)).await;
// TODO: Sync all existing cars on server (this code is broken)
for client in &self.clients {

4
src/server/packet.rs
View File

@@ -54,10 +54,10 @@ impl NotificationPacket {
pub fn new<S: Into<String>>(msg: S) -> Self {
Self(format!("J{}", msg.into()))
}
pub fn welcome<S: Into<String>>(msg: S) -> Self {
pub fn player_welcome<S: Into<String>>(msg: S) -> Self {
Self(format!("JWelcome {}!", msg.into()))
}
pub fn left<S: Into<String>>(msg: S) -> Self {
pub fn player_left<S: Into<String>>(msg: S) -> Self {
Self(format!("L{} left the server!", msg.into()))
}
}