From b8e4f506cc5a9ed3fae5d8ad42c1d7338a861cc2 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 15 Sep 2020 20:06:45 -0500 Subject: [PATCH] Projectile effects are now drained, so that the same projectile can't trigger it's effects on multiple enemies. --- assets/common/items/weapons/sceptre/starter_sceptre.ron | 2 +- common/src/sys/projectile.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/common/items/weapons/sceptre/starter_sceptre.ron b/assets/common/items/weapons/sceptre/starter_sceptre.ron index cf527da88d..26b4d5d03d 100644 --- a/assets/common/items/weapons/sceptre/starter_sceptre.ron +++ b/assets/common/items/weapons/sceptre/starter_sceptre.ron @@ -1,4 +1,4 @@ -Item( +ItemDef( name: "Naturalist Walking Stick", description: "Heals your allies with the power of nature.", kind: Tool( diff --git a/common/src/sys/projectile.rs b/common/src/sys/projectile.rs index a0830c0af0..e9677c2394 100644 --- a/common/src/sys/projectile.rs +++ b/common/src/sys/projectile.rs @@ -75,7 +75,7 @@ impl<'a> System<'a> for Sys { continue; } - for effect in projectile.hit_entity.iter().cloned() { + for effect in projectile.hit_entity.drain(..) { match effect { projectile::Effect::Damage(healthchange) => { let owner_uid = projectile.owner.unwrap();