Adding missing functionality

combat cooldowns wouldn't reset