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

Fixed crash from changes in explosion code.

Browse Source
This commit is contained in:
Sam 2020-11-04 21:48:59 -06:00
parent a0af315930
commit f69f494524
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/src/events/entity_manipulation.rs
View File

@ -615,12 +615,7 @@ pub fn handle_explosion(
} }
}, },
RadiusEffect::Entity(target, mut effect) => { RadiusEffect::Entity(target, mut effect) => {
for (entity_b, pos_b, health_b) in ( for (entity_b, pos_b) in (&ecs.entities(), &ecs.read_storage::<comp::Pos>()).join()
&ecs.entities(),
&ecs.read_storage::<comp::Pos>(),
&ecs.read_storage::<comp::Health>(),
)
.join()
{ {
// See if entities are in the same group // See if entities are in the same group
let mut same_group = owner_entity let mut same_group = owner_entity
@ -646,12 +641,19 @@ pub fn handle_explosion(
let distance_squared = pos.distance_squared(pos_b.0); let distance_squared = pos.distance_squared(pos_b.0);
let strength = 1.0 - distance_squared / explosion.radius.powi(2); let strength = 1.0 - distance_squared / explosion.radius.powi(2);
if strength > 0.0 && !health_b.is_dead { if strength > 0.0 {
let is_alive = ecs
.read_storage::<comp::Health>()
.get(entity_b)
.map_or(false, |h| !h.is_dead);
if is_alive {
effect.modify_strength(strength); effect.modify_strength(strength);
server.state().apply_effect(entity_b, effect, owner); server.state().apply_effect(entity_b, effect, owner);
// Apply energy change // Apply energy change
if let Some(owner) = owner_entity { if let Some(owner) = owner_entity {
if let Some(energy) = ecs.write_storage::<comp::Energy>().get_mut(owner) if let Some(energy) =
ecs.write_storage::<comp::Energy>().get_mut(owner)
{ {
energy.change_by(EnergyChange { energy.change_by(EnergyChange {
amount: explosion.energy_regen as i32, amount: explosion.energy_regen as i32,
@ -661,6 +663,7 @@ pub fn handle_explosion(
} }
} }
} }
}
}, },
} }
} }