diff --git a/OpenRA.Mods.RA/Activities/Attack.cs b/OpenRA.Mods.RA/Activities/Attack.cs index e290444337..4768b162d3 100755 --- a/OpenRA.Mods.RA/Activities/Attack.cs +++ b/OpenRA.Mods.RA/Activities/Attack.cs @@ -51,7 +51,7 @@ namespace OpenRA.Mods.RA.Activities protected virtual Activity InnerTick( Actor self, AttackBase attack ) { if (IsCanceled) return NextActivity; - var facing = self.Trait(); + if (!Target.IsValid) return NextActivity; @@ -70,6 +70,7 @@ namespace OpenRA.Mods.RA.Activities } var desiredFacing = Util.GetFacing(Target.CenterLocation - self.CenterLocation, 0); + var facing = self.Trait(); if (facing.Facing != desiredFacing) return Util.SequenceActivities( new Turn( desiredFacing ), this );