Fixed collision bug that caused collision to not always register with the player.

Signed-off-by: Olof Wallentin <olov.wallentin@gmail.com>
Successful merge with master branch.

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>