--- a/rust/hedgewars-server/src/server/actions.rs Sun Dec 16 00:09:20 2018 +0100
+++ b/rust/hedgewars-server/src/server/actions.rs Sun Dec 16 00:12:29 2018 +0100
@@ -1,26 +1,17 @@
-use std::{
- io, io::Write,
- iter::once,
- mem::replace
-};
use super::{
+ client::HWClient,
core::HWServer,
+ coretypes::{ClientId, GameCfg, RoomId, VoteType},
+ handlers,
+ room::HWRoom,
room::{GameInfo, RoomFlags},
- client::HWClient,
- coretypes::{ClientId, RoomId, GameCfg, VoteType},
- room::HWRoom,
- handlers
};
use crate::{
- protocol::messages::{
- HWProtocolMessage,
- HWServerMessage,
- HWServerMessage::*,
- server_chat
- },
- utils::to_engine_msg
+ protocol::messages::{server_chat, HWProtocolMessage, HWServerMessage, HWServerMessage::*},
+ utils::to_engine_msg,
};
-use rand::{thread_rng, Rng, distributions::Uniform};
+use rand::{distributions::Uniform, thread_rng, Rng};
+use std::{io, io::Write, iter::once, mem::replace};
#[cfg(feature = "official-server")]
use super::database;
@@ -31,22 +22,28 @@
ToAll {
room_id: Option<RoomId>,
protocol: Option<u16>,
- skip_self: bool
- }
+ skip_self: bool,
+ },
}
pub struct PendingMessage {
pub destination: Destination,
- pub message: HWServerMessage
+ pub message: HWServerMessage,
}
impl PendingMessage {
pub fn send(message: HWServerMessage, client_id: ClientId) -> PendingMessage {
- PendingMessage{ destination: Destination::ToId(client_id), message}
+ PendingMessage {
+ destination: Destination::ToId(client_id),
+ message,
+ }
}
pub fn send_self(message: HWServerMessage) -> PendingMessage {
- PendingMessage{ destination: Destination::ToSelf, message }
+ PendingMessage {
+ destination: Destination::ToSelf,
+ message,
+ }
}
pub fn send_all(message: HWServerMessage) -> PendingMessage {
@@ -55,41 +52,63 @@
protocol: None,
skip_self: false,
};
- PendingMessage{ destination, message }
+ PendingMessage {
+ destination,
+ message,
+ }
}
pub fn in_room(mut self, clients_room_id: RoomId) -> PendingMessage {
- if let Destination::ToAll {ref mut room_id, ..} = self.destination {
+ if let Destination::ToAll {
+ ref mut room_id, ..
+ } = self.destination
+ {
*room_id = Some(clients_room_id)
}
self
}
pub fn with_protocol(mut self, protocol_number: u16) -> PendingMessage {
- if let Destination::ToAll {ref mut protocol, ..} = self.destination {
+ if let Destination::ToAll {
+ ref mut protocol, ..
+ } = self.destination
+ {
*protocol = Some(protocol_number)
}
self
}
pub fn but_self(mut self) -> PendingMessage {
- if let Destination::ToAll {ref mut skip_self, ..} = self.destination {
+ if let Destination::ToAll {
+ ref mut skip_self, ..
+ } = self.destination
+ {
*skip_self = true
}
self
}
- pub fn action(self) -> Action { Send(self) }
+ pub fn action(self) -> Action {
+ Send(self)
+ }
}
impl Into<Action> for PendingMessage {
- fn into(self) -> Action { self.action() }
+ fn into(self) -> Action {
+ self.action()
+ }
}
impl HWServerMessage {
- pub fn send(self, client_id: ClientId) -> PendingMessage { PendingMessage::send(self, client_id) }
- pub fn send_self(self) -> PendingMessage { PendingMessage::send_self(self) }
- pub fn send_all(self) -> PendingMessage { PendingMessage::send_all(self) }
+ pub fn send(self, client_id: ClientId) -> PendingMessage {
+ PendingMessage::send(self, client_id)
+ }
+ pub fn send_self(self) -> PendingMessage {
+ PendingMessage::send_self(self)
+ }
+ pub fn send_all(self) -> PendingMessage {
+ PendingMessage::send_all(self)
+ }
}
pub enum Action {
@@ -110,11 +129,19 @@
StartRoomGame(RoomId),
SendTeamRemovalMessage(String),
FinishRoomGame(RoomId),
- SendRoomData{to: ClientId, teams: bool, config: bool, flags: bool},
- AddVote{vote: bool, is_forced: bool},
+ SendRoomData {
+ to: ClientId,
+ teams: bool,
+ config: bool,
+ flags: bool,
+ },
+ AddVote {
+ vote: bool,
+ is_forced: bool,
+ },
ApplyVoting(VoteType, RoomId),
Warn(String),
- ProtocolError(String)
+ ProtocolError(String),
}
use self::Action::*;
@@ -126,31 +153,38 @@
let c = &server.clients[client_id];
let nick = c.nick.clone();
- if let Some(id) = c.room_id{
+ if let Some(id) = c.room_id {
if id != server.lobby_id {
- server.react(client_id, vec![
- MoveToLobby(format!("quit: {}", msg.clone()))]);
+ server.react(
+ client_id,
+ vec![MoveToLobby(format!("quit: {}", msg.clone()))],
+ );
}
}
- server.react(client_id, vec![
- LobbyLeft(nick, msg.clone()).send_all().action(),
- Bye(msg).send_self().action(),
- RemoveClient]);
- },
+ server.react(
+ client_id,
+ vec![
+ LobbyLeft(nick, msg.clone()).send_all().action(),
+ Bye(msg).send_self().action(),
+ RemoveClient,
+ ],
+ );
+ }
RemoveClient => {
server.removed_clients.push(client_id);
if server.clients.contains(client_id) {
server.clients.remove(client_id);
}
- },
- ReactProtocolMessage(msg) =>
- handlers::handle(server, client_id, msg),
+ }
+ ReactProtocolMessage(msg) => handlers::handle(server, client_id, msg),
CheckRegistered => {
let client = &server.clients[client_id];
if client.protocol_number > 0 && client.nick != "" {
- let has_nick_clash = server.clients.iter().any(
- |(id, c)| id != client_id && c.nick == client.nick);
+ let has_nick_clash = server
+ .clients
+ .iter()
+ .any(|(id, c)| id != client_id && c.nick == client.nick);
let actions = if !client.is_checker() && has_nick_clash {
if client.protocol_number < 38 {
@@ -164,7 +198,7 @@
};
server.react(client_id, actions);
}
- },
+ }
JoinLobby => {
server.clients[client_id].room_id = Some(server.lobby_id);
@@ -179,24 +213,33 @@
let everyone_msg = LobbyJoined(vec![server.clients[client_id].nick.clone()]);
let flags_msg = ClientFlags(
"+i".to_string(),
- server.clients.iter()
+ server
+ .clients
+ .iter()
.filter(|(_, c)| c.room_id.is_some())
.map(|(_, c)| c.nick.clone())
- .collect());
+ .collect(),
+ );
let server_msg = ServerMessage("\u{1f994} is watching".to_string());
- let rooms_msg = Rooms(server.rooms.iter()
- .filter(|(id, _)| *id != server.lobby_id)
- .flat_map(|(_, r)|
- r.info(r.master_id.map(|id| &server.clients[id])))
- .collect());
- server.react(client_id, vec![
- everyone_msg.send_all().but_self().action(),
- joined_msg.send_self().action(),
- flags_msg.send_self().action(),
- server_msg.send_self().action(),
- rooms_msg.send_self().action(),
- ]);
- },
+ let rooms_msg = Rooms(
+ server
+ .rooms
+ .iter()
+ .filter(|(id, _)| *id != server.lobby_id)
+ .flat_map(|(_, r)| r.info(r.master_id.map(|id| &server.clients[id])))
+ .collect(),
+ );
+ server.react(
+ client_id,
+ vec![
+ everyone_msg.send_all().but_self().action(),
+ joined_msg.send_self().action(),
+ flags_msg.send_self().action(),
+ server_msg.send_self().action(),
+ rooms_msg.send_self().action(),
+ ],
+ );
+ }
AddRoom(name, password) => {
let room_id = server.add_room();;
@@ -208,16 +251,21 @@
r.protocol_number = c.protocol_number;
let actions = vec![
- RoomAdd(r.info(Some(&c))).send_all()
- .with_protocol(r.protocol_number).action(),
- MoveToRoom(room_id)];
+ RoomAdd(r.info(Some(&c)))
+ .send_all()
+ .with_protocol(r.protocol_number)
+ .action(),
+ MoveToRoom(room_id),
+ ];
server.react(client_id, actions);
- },
+ }
RemoveRoom(room_id) => {
let r = &mut server.rooms[room_id];
- let actions = vec![RoomRemove(r.name.clone()).send_all()
- .with_protocol(r.protocol_number).action()];
+ let actions = vec![RoomRemove(r.name.clone())
+ .send_all()
+ .with_protocol(r.protocol_number)
+ .action()];
server.rooms.remove(room_id);
server.react(client_id, actions);
}
@@ -237,13 +285,25 @@
}
let mut v = vec![
- RoomJoined(vec![c.nick.clone()]).send_all().in_room(room_id).action(),
- ClientFlags("+i".to_string(), vec![c.nick.clone()]).send_all().action(),
- SendRoomUpdate(None)];
+ RoomJoined(vec![c.nick.clone()])
+ .send_all()
+ .in_room(room_id)
+ .action(),
+ ClientFlags("+i".to_string(), vec![c.nick.clone()])
+ .send_all()
+ .action(),
+ SendRoomUpdate(None),
+ ];
if !r.greeting.is_empty() {
- v.push(ChatMsg {nick: "[greeting]".to_string(), msg: r.greeting.clone()}
- .send_self().action());
+ v.push(
+ ChatMsg {
+ nick: "[greeting]".to_string(),
+ msg: r.greeting.clone(),
+ }
+ .send_self()
+ .action(),
+ );
}
if !c.is_master() {
@@ -260,49 +320,82 @@
}
if !team_names.is_empty() {
- info.left_teams.retain(|name|
- !team_names.contains(&name));
+ info.left_teams.retain(|name| !team_names.contains(&name));
info.teams_in_game += team_names.len() as u8;
- r.teams = info.teams_at_start.iter()
+ r.teams = info
+ .teams_at_start
+ .iter()
.filter(|(_, t)| !team_names.contains(&t.name))
- .cloned().collect();
+ .cloned()
+ .collect();
}
} else {
team_names = Vec::new();
}
- v.push(SendRoomData{ to: client_id, teams: true, config: true, flags: true});
+ v.push(SendRoomData {
+ to: client_id,
+ teams: true,
+ config: true,
+ flags: true,
+ });
if let Some(ref info) = r.game_info {
v.push(RunGame.send_self().action());
- v.push(ClientFlags("+g".to_string(), vec![c.nick.clone()])
- .send_all().in_room(r.id).action());
- v.push(ForwardEngineMessage(
- vec![to_engine_msg("e$spectate 1".bytes())])
- .send_self().action());
- v.push(ForwardEngineMessage(info.msg_log.clone())
- .send_self().action());
+ v.push(
+ ClientFlags("+g".to_string(), vec![c.nick.clone()])
+ .send_all()
+ .in_room(r.id)
+ .action(),
+ );
+ v.push(
+ ForwardEngineMessage(vec![to_engine_msg("e$spectate 1".bytes())])
+ .send_self()
+ .action(),
+ );
+ v.push(
+ ForwardEngineMessage(info.msg_log.clone())
+ .send_self()
+ .action(),
+ );
for name in &team_names {
- v.push(ForwardEngineMessage(
- vec![to_engine_msg(once(b'G').chain(name.bytes()))])
- .send_all().in_room(r.id).action());
+ v.push(
+ ForwardEngineMessage(vec![to_engine_msg(
+ once(b'G').chain(name.bytes()),
+ )])
+ .send_all()
+ .in_room(r.id)
+ .action(),
+ );
}
if info.is_paused {
- v.push(ForwardEngineMessage(vec![to_engine_msg(once(b'I'))])
- .send_all().in_room(r.id).action())
+ v.push(
+ ForwardEngineMessage(vec![to_engine_msg(once(b'I'))])
+ .send_all()
+ .in_room(r.id)
+ .action(),
+ )
}
}
}
server.react(client_id, v);
}
- SendRoomData {to, teams, config, flags} => {
+ SendRoomData {
+ to,
+ teams,
+ config,
+ flags,
+ } => {
let mut actions = Vec::new();
let room_id = server.clients[client_id].room_id;
if let Some(r) = room_id.and_then(|id| server.rooms.get(id)) {
if config {
- actions.push(ConfigEntry("FULLMAPCONFIG".to_string(), r.map_config())
- .send(to).action());
+ actions.push(
+ ConfigEntry("FULLMAPCONFIG".to_string(), r.map_config())
+ .send(to)
+ .action(),
+ );
for cfg in r.game_config() {
actions.push(cfg.to_server_msg().send(to).action());
}
@@ -310,41 +403,54 @@
if teams {
let current_teams = match r.game_info {
Some(ref info) => &info.teams_at_start,
- None => &r.teams
+ None => &r.teams,
};
for (owner_id, team) in current_teams.iter() {
- actions.push(TeamAdd(HWRoom::team_info(&server.clients[*owner_id], &team))
- .send(to).action());
- actions.push(TeamColor(team.name.clone(), team.color)
- .send(to).action());
- actions.push(HedgehogsNumber(team.name.clone(), team.hedgehogs_number)
- .send(to).action());
+ actions.push(
+ TeamAdd(HWRoom::team_info(&server.clients[*owner_id], &team))
+ .send(to)
+ .action(),
+ );
+ actions.push(TeamColor(team.name.clone(), team.color).send(to).action());
+ actions.push(
+ HedgehogsNumber(team.name.clone(), team.hedgehogs_number)
+ .send(to)
+ .action(),
+ );
}
}
if flags {
if let Some(id) = r.master_id {
- actions.push(ClientFlags("+h".to_string(), vec![server.clients[id].nick.clone()])
- .send(to).action());
+ actions.push(
+ ClientFlags("+h".to_string(), vec![server.clients[id].nick.clone()])
+ .send(to)
+ .action(),
+ );
}
- let nicks: Vec<_> = server.clients.iter()
+ let nicks: Vec<_> = server
+ .clients
+ .iter()
.filter(|(_, c)| c.room_id == Some(r.id) && c.is_ready())
- .map(|(_, c)| c.nick.clone()).collect();
+ .map(|(_, c)| c.nick.clone())
+ .collect();
if !nicks.is_empty() {
- actions.push(ClientFlags("+r".to_string(), nicks)
- .send(to).action());
+ actions.push(ClientFlags("+r".to_string(), nicks).send(to).action());
}
}
}
server.react(client_id, actions);
}
- AddVote{vote, is_forced} => {
+ AddVote { vote, is_forced } => {
let mut actions = Vec::new();
if let Some(r) = server.room(client_id) {
let mut result = None;
if let Some(ref mut voting) = r.voting {
if is_forced || voting.votes.iter().all(|(id, _)| client_id != *id) {
- actions.push(server_chat("Your vote has been counted.".to_string())
- .send_self().action());
+ actions.push(
+ server_chat("Your vote has been counted.".to_string())
+ .send_self()
+ .action(),
+ );
voting.votes.push((client_id, vote));
let i = voting.votes.iter();
let pro = i.clone().filter(|(_, v)| *v).count();
@@ -352,21 +458,32 @@
let success_quota = voting.voters.len() / 2 + 1;
if is_forced && vote || pro >= success_quota {
result = Some(true);
- } else if is_forced && !vote || contra > voting.voters.len() - success_quota {
+ } else if is_forced && !vote || contra > voting.voters.len() - success_quota
+ {
result = Some(false);
}
} else {
- actions.push(server_chat("You already have voted.".to_string())
- .send_self().action());
+ actions.push(
+ server_chat("You already have voted.".to_string())
+ .send_self()
+ .action(),
+ );
}
} else {
- actions.push(server_chat("There's no voting going on.".to_string())
- .send_self().action());
+ actions.push(
+ server_chat("There's no voting going on.".to_string())
+ .send_self()
+ .action(),
+ );
}
if let Some(res) = result {
- actions.push(server_chat("Voting closed.".to_string())
- .send_all().in_room(r.id).action());
+ actions.push(
+ server_chat("Voting closed.".to_string())
+ .send_all()
+ .in_room(r.id)
+ .action(),
+ );
let voting = replace(&mut r.voting, None).unwrap();
if res {
actions.push(ApplyVoting(voting.kind, r.id));
@@ -388,44 +505,62 @@
actions.push(MoveToLobby("kicked".to_string()));
}
}
- },
+ }
VoteType::Map(None) => (),
VoteType::Map(Some(name)) => {
if let Some(location) = server.rooms[room_id].load_config(&name) {
- actions.push(server_chat(location.to_string())
- .send_all().in_room(room_id).action());
+ actions.push(
+ server_chat(location.to_string())
+ .send_all()
+ .in_room(room_id)
+ .action(),
+ );
actions.push(SendRoomUpdate(None));
for (_, c) in server.clients.iter() {
if c.room_id == Some(room_id) {
- actions.push(SendRoomData{
- to: c.id, teams: false,
- config: true, flags: false})
+ actions.push(SendRoomData {
+ to: c.id,
+ teams: false,
+ config: true,
+ flags: false,
+ })
}
}
}
- },
+ }
VoteType::Pause => {
if let Some(ref mut info) = server.rooms[room_id].game_info {
info.is_paused = !info.is_paused;
- actions.push(server_chat("Pause toggled.".to_string())
- .send_all().in_room(room_id).action());
- actions.push(ForwardEngineMessage(vec![to_engine_msg(once(b'I'))])
- .send_all().in_room(room_id).action());
+ actions.push(
+ server_chat("Pause toggled.".to_string())
+ .send_all()
+ .in_room(room_id)
+ .action(),
+ );
+ actions.push(
+ ForwardEngineMessage(vec![to_engine_msg(once(b'I'))])
+ .send_all()
+ .in_room(room_id)
+ .action(),
+ );
}
- },
+ }
VoteType::NewSeed => {
let seed = thread_rng().gen_range(0, 1_000_000_000).to_string();
let cfg = GameCfg::Seed(seed);
actions.push(cfg.to_server_msg().send_all().in_room(room_id).action());
server.rooms[room_id].set_config(cfg);
- },
+ }
VoteType::HedgehogsPerTeam(number) => {
let r = &mut server.rooms[room_id];
let nicks = r.set_hedgehogs_number(number);
- actions.extend(nicks.into_iter().map(|n|
- HedgehogsNumber(n, number).send_all().in_room(room_id).action()
- ));
- },
+ actions.extend(nicks.into_iter().map(|n| {
+ HedgehogsNumber(n, number)
+ .send_all()
+ .in_room(room_id)
+ .action()
+ }));
+ }
}
server.react(id, actions);
}
@@ -440,8 +575,11 @@
if c.is_master() && (r.players_number > 0 || r.is_fixed()) {
actions.push(ChangeMaster(r.id, None));
}
- actions.push(ClientFlags("-i".to_string(), vec![c.nick.clone()])
- .send_all().action());
+ actions.push(
+ ClientFlags("-i".to_string(), vec![c.nick.clone()])
+ .send_all()
+ .action(),
+ );
}
server.react(client_id, actions);
actions = Vec::new();
@@ -452,8 +590,13 @@
actions.push(RemoveRoom(r.id));
} else {
actions.push(RemoveClientTeams);
- actions.push(RoomLeft(c.nick.clone(), msg)
- .send_all().in_room(r.id).but_self().action());
+ actions.push(
+ RoomLeft(c.nick.clone(), msg)
+ .send_all()
+ .in_room(r.id)
+ .but_self()
+ .action(),
+ );
actions.push(SendRoomUpdate(Some(r.name.clone())));
}
}
@@ -462,11 +605,14 @@
ChangeMaster(room_id, new_id) => {
let mut actions = Vec::new();
let room_client_ids = server.room_clients(room_id);
- let new_id = if server.room(client_id).map(|r| r.is_fixed()).unwrap_or(false) {
+ let new_id = if server
+ .room(client_id)
+ .map(|r| r.is_fixed())
+ .unwrap_or(false)
+ {
new_id
} else {
- new_id.or_else(||
- room_client_ids.iter().find(|id| **id != client_id).cloned())
+ new_id.or_else(|| room_client_ids.iter().find(|id| **id != client_id).cloned())
};
let new_nick = new_id.map(|id| server.clients[id].nick.clone());
@@ -475,23 +621,32 @@
Some(id) if id == c.id => {
c.set_is_master(false);
r.master_id = None;
- actions.push(ClientFlags("-h".to_string(), vec![c.nick.clone()])
- .send_all().in_room(r.id).action());
+ actions.push(
+ ClientFlags("-h".to_string(), vec![c.nick.clone()])
+ .send_all()
+ .in_room(r.id)
+ .action(),
+ );
}
Some(_) => unreachable!(),
None => {}
}
r.master_id = new_id;
if !r.is_fixed() && c.protocol_number < 42 {
- r.name.replace_range(.., new_nick.as_ref().map_or("[]", String::as_str));
+ r.name
+ .replace_range(.., new_nick.as_ref().map_or("[]", String::as_str));
}
r.set_join_restriction(false);
r.set_team_add_restriction(false);
let is_fixed = r.is_fixed();
r.set_unregistered_players_restriction(is_fixed);
if let Some(nick) = new_nick {
- actions.push(ClientFlags("+h".to_string(), vec![nick])
- .send_all().in_room(r.id).action());
+ actions.push(
+ ClientFlags("+h".to_string(), vec![nick])
+ .send_all()
+ .in_room(r.id)
+ .action(),
+ );
}
}
if let Some(id) = new_id {
@@ -513,10 +668,13 @@
}
}
server.react(client_id, actions);
- },
+ }
RemoveClientTeams => {
if let (c, Some(r)) = server.client_and_room(client_id) {
- let actions = r.client_teams(c.id).map(|t| RemoveTeam(t.name.clone())).collect();
+ let actions = r
+ .client_teams(c.id)
+ .map(|t| RemoveTeam(t.name.clone()))
+ .collect();
server.react(client_id, actions);
}
}
@@ -524,19 +682,28 @@
if let (c, Some(r)) = server.client_and_room(client_id) {
let name = old_name.unwrap_or_else(|| r.name.clone());
let actions = vec![RoomUpdated(name, r.info(Some(&c)))
- .send_all().with_protocol(r.protocol_number).action()];
+ .send_all()
+ .with_protocol(r.protocol_number)
+ .action()];
server.react(client_id, actions);
}
- },
+ }
StartRoomGame(room_id) => {
let actions = {
- let (room_clients, room_nicks): (Vec<_>, Vec<_>) = server.clients.iter()
- .map(|(id, c)| (id, c.nick.clone())).unzip();
+ let (room_clients, room_nicks): (Vec<_>, Vec<_>) = server
+ .clients
+ .iter()
+ .map(|(id, c)| (id, c.nick.clone()))
+ .unzip();
let room = &mut server.rooms[room_id];
if !room.has_multiple_clans() {
- vec![Warn("The game can't be started with less than two clans!".to_string())]
- } else if room.protocol_number <= 43 && room.players_number != room.ready_players_number {
+ vec![Warn(
+ "The game can't be started with less than two clans!".to_string(),
+ )]
+ } else if room.protocol_number <= 43
+ && room.players_number != room.ready_players_number
+ {
vec![Warn("Not all players are ready".to_string())]
} else if room.game_info.is_some() {
vec![Warn("The game is already in progress".to_string())]
@@ -547,10 +714,14 @@
c.set_is_in_game(false);
c.team_indices = room.client_team_indices(c.id);
}
- vec![RunGame.send_all().in_room(room.id).action(),
- SendRoomUpdate(None),
- ClientFlags("+g".to_string(), room_nicks)
- .send_all().in_room(room.id).action()]
+ vec![
+ RunGame.send_all().in_room(room.id).action(),
+ SendRoomUpdate(None),
+ ClientFlags("+g".to_string(), room_nicks)
+ .send_all()
+ .in_room(room.id)
+ .action(),
+ ]
}
};
server.react(client_id, actions);
@@ -560,8 +731,13 @@
if let Some(r) = server.room(client_id) {
if let Some(ref mut info) = r.game_info {
let msg = once(b'F').chain(team_name.bytes());
- actions.push(ForwardEngineMessage(vec![to_engine_msg(msg)]).
- send_all().in_room(r.id).but_self().action());
+ actions.push(
+ ForwardEngineMessage(vec![to_engine_msg(msg)])
+ .send_all()
+ .in_room(r.id)
+ .but_self()
+ .action(),
+ );
info.teams_in_game -= 1;
if info.teams_in_game == 0 {
actions.push(FinishRoomGame(r.id));
@@ -574,8 +750,13 @@
info.sync_msg = None
}
info.msg_log.push(remove_msg.clone());
- actions.push(ForwardEngineMessage(vec![remove_msg])
- .send_all().in_room(r.id).but_self().action());
+ actions.push(
+ ForwardEngineMessage(vec![remove_msg])
+ .send_all()
+ .in_room(r.id)
+ .but_self()
+ .action(),
+ );
}
}
server.react(client_id, actions);
@@ -591,28 +772,36 @@
if let Some(info) = replace(&mut r.game_info, None) {
for (_, c) in server.clients.iter() {
if c.room_id == Some(room_id) && c.is_joined_mid_game() {
- actions.push(SendRoomData{
- to: c.id, teams: false,
- config: true, flags: false});
+ actions.push(SendRoomData {
+ to: c.id,
+ teams: false,
+ config: true,
+ flags: false,
+ });
for name in &info.left_teams {
- actions.push(TeamRemove(name.clone())
- .send(c.id).action());
+ actions.push(TeamRemove(name.clone()).send(c.id).action());
}
}
}
}
- let nicks: Vec<_> = server.clients.iter_mut()
+ let nicks: Vec<_> = server
+ .clients
+ .iter_mut()
.filter(|(_, c)| c.room_id == Some(room_id))
.map(|(_, c)| {
c.set_is_ready(c.is_master());
c.set_is_joined_mid_game(false);
c
- }).filter_map(|c| if !c.is_master() {
- Some(c.nick.clone())
- } else {
- None
- }).collect();
+ })
+ .filter_map(|c| {
+ if !c.is_master() {
+ Some(c.nick.clone())
+ } else {
+ None
+ }
+ })
+ .collect();
if !nicks.is_empty() {
let msg = if r.protocol_number < 38 {
@@ -627,8 +816,6 @@
Warn(msg) => {
run_action(server, client_id, Warning(msg).send_self().action());
}
- ProtocolError(msg) => {
- run_action(server, client_id, Error(msg).send_self().action())
- }
+ ProtocolError(msg) => run_action(server, client_id, Error(msg).send_self().action()),
}
}