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 amount optional

Browse Source
This commit is contained in:
liids 2019-06-15 10:15:04 +02:00
parent c859371ddb
commit 2cc2a36be2
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/cmd.rs
View File

@ -88,7 +88,7 @@ lazy_static! {
ChatCommand::new( ChatCommand::new(
"spawn", "spawn",
"{} {} {d}", "{} {} {d}",
"/spawn <alignment> <entity> <amount> : Spawn a test entity", "/spawn <alignment> <entity> [amount] : Spawn a test entity",
handle_spawn handle_spawn
), ),
ChatCommand::new( ChatCommand::new(
@ -211,9 +211,15 @@ fn handle_tp(server: &mut Server, entity: EcsEntity, args: String, action: &Chat
} }
fn handle_spawn(server: &mut Server, entity: EcsEntity, args: String, action: &ChatCommand) { fn handle_spawn(server: &mut Server, entity: EcsEntity, args: String, action: &ChatCommand) {
let (opt_align, opt_id, opt_amount) = scan_fmt!(&args, action.arg_fmt, String, NpcKind, u32); let (opt_align, opt_id, opt_amount) = scan_fmt!(&args, action.arg_fmt, String, NpcKind, String);
// This should probably be just an enum and be handled with scan_fmt! // This should be just an enum and be handled with scan_fmt!
let opt_agent = alignment_to_agent(&opt_align.unwrap_or(String::new()), entity); 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 = if let Some(amount) = opt_amount {
amount.parse().ok()
} else { Some(1) };
match (opt_agent, opt_id, opt_amount) { match (opt_agent, opt_id, opt_amount) {
(Some(agent), Some(id), Some(amount)) => { (Some(agent), Some(id), Some(amount)) => {
match server match server