[mr3051] Update combat timer only if timer is set
[mr3052] Fix interrupt channeling when Seduction unapplied, also some code improvements