Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace if-let with match

Browse Source 
Former-commit-id: ed39cbb1ccc69302cb65822ad4a4cfecd2bd8f86
This commit is contained in:
sxv20_ 2019-04-16 17:34:41 +01:00
parent 4e3c97862e
commit dbccb34582
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/src/cmd.rs
View File

@ -4,12 +4,12 @@
use crate::Server; use crate::Server;
use common::{comp, msg::ServerMsg}; use common::{comp, msg::ServerMsg};
use specs::{Entity as EcsEntity, join::Join}; use specs::{join::Join, Entity as EcsEntity};
use vek::*; use vek::*;
use scan_fmt::scan_fmt;
use lazy_static::lazy_static;
use lazy_static::lazy_static;
use scan_fmt::scan_fmt;
/// Struct representing a command that a user can run from server chat /// Struct representing a command that a user can run from server chat
pub struct ChatCommand { pub struct ChatCommand {
/// The keyword used to invoke the command, omitting the leading '/' /// The keyword used to invoke the command, omitting the leading '/'
@ -88,18 +88,17 @@ fn handle_jump(server: &mut Server, entity: EcsEntity, args: String, action: &Ch
let (opt_x, opt_y, opt_z) = scan_fmt!(&args, action.arg_fmt, f32, f32, f32); let (opt_x, opt_y, opt_z) = scan_fmt!(&args, action.arg_fmt, f32, f32, f32);
match (opt_x, opt_y, opt_z) { match (opt_x, opt_y, opt_z) {
(Some(x), Some(y), Some(z)) => { (Some(x), Some(y), Some(z)) => {
if let Some(current_pos) = server match server
.state .state
.read_component_cloned::<comp::phys::Pos>(entity) .read_component_cloned::<comp::phys::Pos>(entity)
{ {
server Some(current_pos) => server
.state .state
.write_component(entity, comp::phys::Pos(current_pos.0 + Vec3::new(x, y, z))) .write_component(entity, comp::phys::Pos(current_pos.0 + Vec3::new(x, y, z))),
} else { None => server.clients.notify(
server.clients.notify(
entity, entity,
ServerMsg::Chat(String::from("Command 'jump' invalid in current state")), ServerMsg::Chat(String::from("Command 'jump' invalid in current state")),
) ),
} }
} }
_ => server _ => server