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

Fix invalid target crash if Leap target dies.

Browse Source
This commit is contained in:
Paul Chote
2019-01-04 17:52:33 +00:00
committed by abcdefg30
parent 01f5c67036
commit 4d3db0d454
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Cnc/Activities/Leap.cs
View File

@@ -35,6 +35,7 @@ namespace OpenRA.Mods.Cnc.Activities
bool canceled = false; bool canceled = false;
bool jumpComplete = false; bool jumpComplete = false;
int ticks = 0; int ticks = 0;
WPos targetPosition;
public Leap(Actor self, Target target, Mobile mobile, Mobile targetMobile, int speed, AttackLeap attack, EdibleByLeap edible) public Leap(Actor self, Target target, Mobile mobile, Mobile targetMobile, int speed, AttackLeap attack, EdibleByLeap edible)
{ {
@@ -65,6 +66,7 @@ namespace OpenRA.Mods.Cnc.Activities
if (canceled) if (canceled)
return; return;
targetPosition = target.CenterPosition;
attack.GrantLeapCondition(self); attack.GrantLeapCondition(self);
} }
@@ -83,7 +85,10 @@ namespace OpenRA.Mods.Cnc.Activities
return this; return this;
} }
var position = length > 1 ? WPos.Lerp(origin, target.CenterPosition, ticks, length - 1) : target.CenterPosition; if (target.Type != TargetType.Invalid)
targetPosition = target.CenterPosition;
var position = length > 1 ? WPos.Lerp(origin, targetPosition, ticks, length - 1) : targetPosition;
mobile.SetVisualPosition(self, position); mobile.SetVisualPosition(self, position);
// We are at the destination // We are at the destination