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

don't capture dead actors

Browse Source
This commit is contained in:
Matthias Mailänder
2014-07-03 10:33:41 +02:00
parent 04f1ebe969
commit e666c75883
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.RA/Activities/CaptureActor.cs
View File

@@ -39,6 +39,9 @@ namespace OpenRA.Mods.RA.Activities
self.World.AddFrameEndTask(w => self.World.AddFrameEndTask(w =>
{ {
if (actor.IsDead())
return;
var lowEnoughHealth = health.HP <= capturableInfo.CaptureThreshold * health.MaxHP; var lowEnoughHealth = health.HP <= capturableInfo.CaptureThreshold * health.MaxHP;
if (!capturesInfo.Sabotage || lowEnoughHealth || actor.Owner.NonCombatant) if (!capturesInfo.Sabotage || lowEnoughHealth || actor.Owner.NonCombatant)
{ {

3
OpenRA.Mods.RA/Activities/ExternalCaptureActor.cs
View File

@@ -59,6 +59,9 @@ namespace OpenRA.Mods.RA.Activities
self.World.AddFrameEndTask(w => self.World.AddFrameEndTask(w =>
{ {
if (target.Actor.IsDead())
return;
var oldOwner = target.Actor.Owner; var oldOwner = target.Actor.Owner;
target.Actor.ChangeOwner(self.Owner); target.Actor.ChangeOwner(self.Owner);