Make all Attack* traits listen to Stop order

OpenRA.Mods.Common/Traits/Attack/AttackBase.cs

@@ -145,6 +145,9 @@ namespace OpenRA.Mods.Common.Traits
 				self.SetTargetLine(target, Color.Red);
 				AttackTarget(target, order.Queued, true, forceAttack);
 			}
+
+			if (order.OrderString == "Stop")
+				self.CancelActivity();
 		}
 
 		static Target TargetFromOrder(Actor self, Order order)

OpenRA.Mods.Common/Traits/Attack/AttackCharge.cs

@@ -77,14 +77,6 @@ namespace OpenRA.Mods.Common.Traits
 			return new ChargeAttack(this, newTarget);
 		}
 
-		public override void ResolveOrder(Actor self, Order order)
-		{
-			base.ResolveOrder(self, order);
-
-			if (order.OrderString == "Stop")
-				self.CancelActivity();
-		}
-
 		class ChargeAttack : Activity
 		{
 			readonly AttackCharge attack;