X-Git-Url: http://git.euphorik.ch/index.cgi?a=blobdiff_plain;f=backend%2Fsrc%2Fminecraft_controller.rs;h=9287cdae762389bbebff8039ac8cc953f24af540;hb=4524f6e31cc7165b16a1480979fced43c9066016;hp=163008a0f439810ac2192975a3dfa003f1726c0e;hpb=7d3366c4902d5c3e91551668e92d4572f9634511;p=minecraft_web.git diff --git a/backend/src/minecraft_controller.rs b/backend/src/minecraft_controller.rs index 163008a..9287cda 100644 --- a/backend/src/minecraft_controller.rs +++ b/backend/src/minecraft_controller.rs @@ -86,14 +86,16 @@ fn get_status_from_rcon(rcon_password: &str) -> StatusFromRcon { StatusFromRcon { players: match client.send_command("list".to_string()) { - Ok(resp) => { - resp.body - .split('\n') - .skip(1) - .filter(|n| !n.is_empty()) - .map(|n| n.to_string()) - .collect() - }, + Ok(resp) => + match resp.body.find(':') { + Some(i) if i < resp.body.len() -1 => + resp.body[i + 1..resp.body.len() - 1] + .split(',') + .map(|nick| nick.trim().to_string()) + .filter(|nick| !nick.is_empty()) + .collect(), + _ => Vec::new() + }, Err(_e) => { println!("Error from 'list' command"); Vec::new()