This will stop the "watch fight" interaction from completely overriding user driven commands. 
Autonomous actions will still be overridden.

Compatible with the fight hack by FFS

This has only been tested with nightlife, though it may work with UNI (Post patch).