Changed CombatAnimation to EntityAnimator

Also minor code cleanup and error checking.