epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9365 from atlimit8/HealUnitsCrateAction_use_ActorsWithTrait

Browse Source 
HealUnitsCrateAction.Activate() use ActorsWithTrait<Health>()
This commit is contained in:
Matthias Mailänder
2015-09-19 12:53:25 +02:00
parent 6c26251b41 1d9d28b540
commit b5a5dfdb54
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.Common/Traits/Crates/HealUnitsCrateAction.cs
View File

@@ -26,12 +26,9 @@ namespace OpenRA.Mods.Common.Traits
public override void Activate(Actor collector)
{
foreach (var unit in collector.World.Actors.Where(a => a.Owner == collector.Owner))
{
var health = unit.TraitOrDefault<Health>();
if (health != null && !health.IsDead)
health.InflictDamage(unit, unit, -(health.MaxHP - health.HP), null, true);
}
foreach (var healable in collector.World.ActorsWithTrait<Health>().Where(tp => tp.Actor.Owner == collector.Owner))
if (!healable.Trait.IsDead)
healable.Trait.InflictDamage(healable.Actor, healable.Actor, -(healable.Trait.MaxHP - healable.Trait.HP), null, true);
base.Activate(collector);
}