Doing no-rightclick-in-combat the right way!