Fixed instances where ch->fighting was used instead of is_fighting()
Merge pull request #236 from dlowe-net/fix-fighting-predication

Fixed instances where ch->fighting was used instead of is_fighting()