Merge pull request #9509 from penev92/upgradeTickTank

Convert Tick Tank to use DeployToUpgrade + some fixes
2016-02-23 23:33:38 +01:00
parent 4f1fa3acec 118d015e4d
commit ecbd1a0247
9 changed files with 145 additions and 93 deletions
--- a/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs
+++ b/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs
@@ -31,6 +31,12 @@ namespace OpenRA.Mods.Common.Traits

 		public virtual void Tick(Actor self)
 		{
+			if (IsTraitDisabled)
+			{
+				Target = Target.Invalid;
+				return;
+			}
+
 			DoAttack(self, Target);
 			IsAttacking = Target.IsValidFor(self);
 		}