Collision fixed

Tile collision is still far from perfect, but polish can come later.
Revert "Collision fixed"

This reverts commit eddd0285f1cd32331b36e09b582c0b2f5aa061ba.