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

make it more laconic

Browse Source
This commit is contained in:
liids 2019-06-15 15:42:39 +02:00
parent 6670c2b8fa
commit bcf7127736
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/cmd.rs
View File

@ -216,14 +216,10 @@ fn handle_spawn(server: &mut Server, entity: EcsEntity, args: String, action: &C
let opt_agent = alignment_to_agent(&opt_align.unwrap_or(String::new()), entity);
// Make sure the amount is either not provided or a valid value
let opt_amount: Option<u32> = if let Some(amount) = opt_amount {
match amount.parse().ok() {
Some(x) if x == 0 => None,
x => x,
}
} else {
Some(1)
};
let opt_amount = opt_amount
.and_then(|a| a.parse().ok())
.or(Some(1))
.and_then(|a| if a > 0 { Some(a) } else { None });
match (opt_agent, opt_id, opt_amount) {
(Some(agent), Some(id), Some(amount)) => {