diff options
Diffstat (limited to 'server/src')
| -rw-r--r-- | server/src/data.rs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/server/src/data.rs b/server/src/data.rs index 966fd0d2..24e8e232 100644 --- a/server/src/data.rs +++ b/server/src/data.rs @@ -192,17 +192,21 @@ impl Gamedata { match r.action { Action::Never => {} Action::Passive => recipes.push(Recipe::Passive { - duration: r.duration.expect("duration for passive missing"), + duration: r.duration.ok_or(anyhow!("duration for passive missing"))?, warn: r.warn, tile, revert_duration: r.revert_duration, - input: inputs.next().expect("passive recipe without input"), + input: inputs + .next() + .ok_or(anyhow!("passive recipe without input"))?, output: outputs.next(), }), Action::Active => recipes.push(Recipe::Active { - duration: r.duration.expect("duration for active missing"), + duration: r.duration.ok_or(anyhow!("duration for active missing"))?, tile, - input: inputs.next().expect("active recipe without input"), + input: inputs + .next() + .ok_or(anyhow!("active recipe without input"))?, outputs: [outputs.next(), outputs.next()], }), Action::Instant => { |