Either make revive work while in combat, or fix the 'stuck in combat' bugs.