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

Merge pull request #5892 from Mailaender/destroyed-repair-building-nre

Browse Source 
Added a check if the rearm host building is gone
This commit is contained in:
Paul Chote
2014-07-09 20:55:20 +12:00
parent 15ec2b40f2 dc2880e047
commit 2524ead1c4
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.RA/Activities/Rearm.cs
View File

@@ -37,11 +37,13 @@ namespace OpenRA.Mods.RA.Activities
var hostBuilding = self.World.ActorMap.GetUnitsAt(self.Location)
.FirstOrDefault(a => a.HasTrait<RenderBuilding>());
if (hostBuilding == null || !hostBuilding.IsInWorld)
return NextActivity;
if (!limitedAmmo.GiveAmmo())
return NextActivity;
if (hostBuilding != null)
hostBuilding.Trait<RenderBuilding>().PlayCustomAnim(hostBuilding, "active");
hostBuilding.Trait<RenderBuilding>().PlayCustomAnim(hostBuilding, "active");
remainingTicks = limitedAmmo.ReloadTimePerAmmo();
}

2
OpenRA.Mods.RA/Activities/Repair.cs
View File

@@ -24,7 +24,7 @@ namespace OpenRA.Mods.RA.Activities
public override Activity Tick(Actor self)
{
if (IsCanceled) return NextActivity;
if (host != null && !host.IsInWorld) return NextActivity;
if (host == null || !host.IsInWorld) return NextActivity;
health = self.TraitOrDefault<Health>();
if (health == null) return NextActivity;