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

cargo format

Browse Source
This commit is contained in:
KyoZM
2019-10-07 01:38:28 -03:00
parent 064f33666a
commit 5abe88ecee
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
server/src/cmd.rs
View File

@ -961,9 +961,14 @@ fn handle_exp(server: &mut Server, entity: EcsEntity, args: String, action: &Cha
} }
} }
fn handle_remove_lights(server: &mut Server, entity: EcsEntity, args: String, action: &ChatCommand) { fn handle_remove_lights(
server: &mut Server,
entity: EcsEntity,
args: String,
action: &ChatCommand,
) {
let opt_radius = scan_fmt_some!(&args, action.arg_fmt, f32); let opt_radius = scan_fmt_some!(&args, action.arg_fmt, f32);
let opt_player_pos = server.state.read_component_cloned::<comp::Pos>(entity); let opt_player_pos = server.state.read_component_cloned::<comp::Pos>(entity);
let mut to_delete = vec![]; let mut to_delete = vec![];
match opt_player_pos { match opt_player_pos {
@ -973,16 +978,21 @@ fn handle_remove_lights(server: &mut Server, entity: EcsEntity, args: String, ac
&ecs.entities(), &ecs.entities(),
&ecs.read_storage::<comp::Pos>(), &ecs.read_storage::<comp::Pos>(),
&ecs.read_storage::<comp::LightEmitter>(), &ecs.read_storage::<comp::LightEmitter>(),
!&ecs.read_storage::<comp::Player>() !&ecs.read_storage::<comp::Player>(),
).join() { )
if opt_radius.map(|r| pos.0.distance(player_pos.0) < r).unwrap_or(true) { .join()
{
if opt_radius
.map(|r| pos.0.distance(player_pos.0) < r)
.unwrap_or(true)
{
to_delete.push(entity); to_delete.push(entity);
} }
} }
}, }
None => server.clients.notify( None => server.clients.notify(
entity, entity,
ServerMsg::private(String::from("You have no position.")), ServerMsg::private(String::from("You have no position.")),
), ),
} }
@ -993,9 +1003,7 @@ fn handle_remove_lights(server: &mut Server, entity: EcsEntity, args: String, ac
} }
server.clients.notify( server.clients.notify(
entity, entity,
ServerMsg::private(String::from( ServerMsg::private(String::from(format!("Removed {} lights!", size))),
format!("Removed {} lights!", size)
)),
); );
} }