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

Use CancelActivity instead of hackily using ResolveOrder

Browse Source
This commit is contained in:
abcdefg30
2020-09-15 17:13:27 +02:00
committed by Paul Chote
parent 391d9030cb
commit fd69bce609
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/Capturable.cs
View File

@@ -43,11 +43,7 @@ namespace OpenRA.Mods.Common.Traits
void INotifyCapture.OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner, BitSet<CaptureType> captureTypes) void INotifyCapture.OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner, BitSet<CaptureType> captureTypes)
{ {
if (Info.CancelActivity) if (Info.CancelActivity)
{ self.CancelActivity();
var stop = new Order("Stop", self, false);
foreach (var t in self.TraitsImplementing<IResolveOrder>())
t.ResolveOrder(self, stop);
}
} }
protected override void TraitEnabled(Actor self) { captureManager.RefreshCapturable(self); } protected override void TraitEnabled(Actor self) { captureManager.RefreshCapturable(self); }