Fixed bugs for combat animation