fixed collision detection
Merge branch 'master' of github.com:zamN/BlackbeardsRedemption