Merge pull request #3237 from Ispil/master

Fixes issue #2872, partially. Carp are now smashed by shuttles if they d...