Get rid of unwraps

This commit is contained in:
timokoesters
2019-08-03 22:08:19 +02:00
parent 7365dbe9e6
commit 74b7613cd9

View File

@ -878,18 +878,19 @@ impl Server {
} }
// Give EXP to the client // Give EXP to the client
if let comp::HealthSource::Attack { by } = dying.cause { let mut stats = ecs.write_storage::<comp::Stats>();
ecs.entity_from_uid(by.into()).map(|attacker| { if let Some(entity_stats) = stats.get(entity).cloned() {
let mut stats = ecs.write_storage::<comp::Stats>(); if let comp::HealthSource::Attack { by } = dying.cause {
let entity_stats = stats.get(entity).unwrap().clone(); ecs.entity_from_uid(by.into()).map(|attacker| {
let attacker_stats = stats.get_mut(attacker).unwrap(); if let Some(attacker_stats) = stats.get_mut(attacker) {
// TODO: Discuss whether we should give EXP by Player Killing or not.
// TODO: Discuss whether we should give EXP by Player Killing or not. attacker_stats.exp.change_by(
attacker_stats.exp.change_by( entity_stats.health.maximum() as f64 / 10.0
entity_stats.health.maximum() as f64 / 10.0 * entity_stats.level.level() as f64,
* entity_stats.level.level() as f64, );
); }
}); });
}
} }
entity entity