raidboss: fix resetWhenOutOfCombat (#2954)
raidboss: fix resetWhenOutOfCombat (#2954)

This fixes issues where going into combat would reset which
CE the Zadnor triggers thought you were in.  In particular,
if resetWhenOutOfCombat is set, the triggers themselves
must always specify stopping combat.
quisquous/cactbot,quisquous/cactbot,quisquous/cactbot,quisquous/cactbot,quisquous/cactbot,quisquous/cactbot