Cats Drown Themselves when avoiding your combat

Cats get up and move back a few blocks when their owner player is in combat. There is currently no check against their new location being lethal. They'll walk into water, remain seated and drown.

Steps to reproduce

1) Tame a Cat
2) Fight mobs near water.
3) Cat may drown itself