From 6289a097a59971a191ecb4ac7c5b34f2ae480738 Mon Sep 17 00:00:00 2001 From: timokoesters Date: Sat, 29 Jun 2019 14:05:30 +0200 Subject: [PATCH] Rename /who to /players and fmt --- server/src/cmd.rs | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/server/src/cmd.rs b/server/src/cmd.rs index b8bc2416c5..a651945167 100644 --- a/server/src/cmd.rs +++ b/server/src/cmd.rs @@ -99,10 +99,10 @@ lazy_static! { handle_spawn, ), ChatCommand::new( - "who", + "players", "{}", - "/who : Show the online players list", - handle_who + "/players : Show the online players list", + handle_players, ), ChatCommand::new( "help", "", "/help: Display this message", handle_help) @@ -291,28 +291,24 @@ fn handle_spawn(server: &mut Server, entity: EcsEntity, args: String, action: &C } } -fn handle_who(server: &mut Server, entity: EcsEntity, _args: String, _action: &ChatCommand) { +fn handle_players(server: &mut Server, entity: EcsEntity, _args: String, _action: &ChatCommand) { let ecs = server.state.ecs(); let players = ecs.read_storage::(); let count = players.join().count(); let mut str: String = format!("Online players ({})", count); if count > 0 { str += ": "; - let mut player_list: String = players - .join() - .fold(String::new(), |mut s, player| { - s += &player.alias; - s += ","; - s - }); + let mut player_list: String = players.join().fold(String::new(), |mut s, player| { + s += &player.alias; + s += ","; + s + }); player_list.pop(); server - .clients - .notify(entity, ServerMsg::Chat(str + &player_list)); + .clients + .notify(entity, ServerMsg::Chat(str + &player_list)); } else { - server - .clients - .notify(entity, ServerMsg::Chat(str)); + server.clients.notify(entity, ServerMsg::Chat(str)); } }