Apparently there were no fights on the "Live Free or Die" set. However, there may have been multiple takes due to Bruce Willis' infatuation with Maggie Q.
StarPulse :
"If it was possible to genetically engineer the perfect woman in the world... it would be Maggie Q... She should be cloned." Bruce Willis was impressed with his Live Free or Die co-star.
Maggie Q Official site