Forgot to add CombatListener for previous commit