Small fix to combat messages

Fixed an issue when the message for end of the Cancel spell effect would sometimes be displayed at the beginning of the next combat.

Additionally, that message will no longer be displayed if the spell's duration ends, but the enemy has been killed earlier that turn.