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

Merge pull request #11232 from abcdefg30/navalRepair

Browse Source 
Fix possible instant repairs by spamming Repair activities
This commit is contained in:
Paul Chote
2016-05-07 10:30:57 +01:00
parent 5505595a79 25b1c991a2
commit cf4ef11403
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Mods.Common/Activities/Repair.cs
View File

@@ -32,11 +32,20 @@ namespace OpenRA.Mods.Common.Activities
public override Activity Tick(Actor self) public override Activity Tick(Actor self)
{ {
if (IsCanceled) return NextActivity; if (IsCanceled)
if (host == null || !host.IsInWorld) return NextActivity; {
if (remainingTicks-- == 0)
return NextActivity;
return this;
}
if (host == null || !host.IsInWorld)
return NextActivity;
health = self.TraitOrDefault<Health>(); health = self.TraitOrDefault<Health>();
if (health == null) return NextActivity; if (health == null)
return NextActivity;
if (health.DamageState == DamageState.Undamaged) if (health.DamageState == DamageState.Undamaged)
{ {