From 7c351a0c7a497d30f4826a19e6c6e92d3e7b5065 Mon Sep 17 00:00:00 2001 From: troido Date: Mon, 6 Apr 2020 19:28:45 +0200 Subject: improved error handling --- src/systems/spawn.rs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/systems') diff --git a/src/systems/spawn.rs b/src/systems/spawn.rs index 33dbc95..903b9b2 100644 --- a/src/systems/spawn.rs +++ b/src/systems/spawn.rs @@ -44,10 +44,14 @@ impl <'a> System<'a> for Spawn { if let Some(last_spawn) = spawner.last_spawn { if time.time > last_spawn + spawner.delay { spawner.last_spawn = None; - let mut preent = new.encyclopedia.construct(&spawner.template).expect("unable to spawn entity from spawner"); - preent.push(ComponentWrapper::Clan(spawner.clan.clone())); - preent.push(ComponentWrapper::Home(Home{home: position.pos})); - new.to_build.push((position.pos, preent)); + match new.encyclopedia.construct(&spawner.template) { + Ok(mut preent) => { + preent.push(ComponentWrapper::Clan(spawner.clan.clone())); + preent.push(ComponentWrapper::Home(Home{home: position.pos})); + new.to_build.push((position.pos, preent)); + } + Err(err) => {println!("Error: can not spawn entity from spawner: {}", err);} + } } } else { spawner.last_spawn = Some(time.time) -- cgit