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

Properly cancel EnterActor when target capturable trait is disabled.

Browse Source
This commit is contained in:
tovl
2020-07-23 16:58:31 +02:00
committed by abcdefg30
parent 9cd6df2929
commit 5e8121bd0b
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Mods.Common/Activities/CaptureActor.cs
View File

@@ -28,6 +28,19 @@ namespace OpenRA.Mods.Common.Activities
manager = self.Trait<CaptureManager>(); manager = self.Trait<CaptureManager>();
} }
protected override void TickInner(Actor self, Target target, bool targetIsDeadOrHiddenActor)
{
if (target.Type == TargetType.Actor && enterActor != target.Actor)
{
enterActor = target.Actor;
enterCaptureManager = target.Actor.TraitOrDefault<CaptureManager>();
}
if (!targetIsDeadOrHiddenActor && target.Type != TargetType.FrozenActor &&
(enterCaptureManager == null || !enterCaptureManager.CanBeTargetedBy(enterActor, self, manager)))
Cancel(self, true);
}
protected override bool TryStartEnter(Actor self, Actor targetActor) protected override bool TryStartEnter(Actor self, Actor targetActor)
{ {
if (enterActor != targetActor) if (enterActor != targetActor)