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

Fix captor being disposed if the capture fails.

Browse Source
This commit is contained in:
Paul Chote
2018-09-30 11:18:49 +01:00
committed by abcdefg30
parent d97a2a5fa0
commit db1f794beb
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,7 @@ namespace OpenRA.Mods.Common.Activities
readonly CaptureManager manager; readonly CaptureManager manager;
public CaptureActor(Actor self, Actor target) public CaptureActor(Actor self, Actor target)
: base(self, target, EnterBehaviour.Dispose) : base(self, target, EnterBehaviour.Exit)
{ {
actor = target; actor = target;
manager = self.Trait<CaptureManager>(); manager = self.Trait<CaptureManager>();
@@ -70,8 +70,13 @@ namespace OpenRA.Mods.Common.Activities
void DoCapture(Actor self, Captures captures) void DoCapture(Actor self, Captures captures)
{ {
var oldOwner = actor.Owner;
self.World.AddFrameEndTask(w => self.World.AddFrameEndTask(w =>
{ {
// The target died or was already captured during this tick
if (actor.IsDead || oldOwner != actor.Owner)
return;
// Sabotage instead of capture // Sabotage instead of capture
if (captures.Info.SabotageThreshold > 0 && !actor.Owner.NonCombatant) if (captures.Info.SabotageThreshold > 0 && !actor.Owner.NonCombatant)
{ {
@@ -91,9 +96,7 @@ namespace OpenRA.Mods.Common.Activities
} }
// Do the capture // Do the capture
var oldOwner = actor.Owner; actor.ChangeOwnerSync(self.Owner);
actor.ChangeOwner(self.Owner);
foreach (var t in actor.TraitsImplementing<INotifyCapture>()) foreach (var t in actor.TraitsImplementing<INotifyCapture>())
t.OnCapture(actor, self, oldOwner, self.Owner); t.OnCapture(actor, self, oldOwner, self.Owner);