Improve map collision handling

Now it will put you to as close to the wall as you can get instead of
just preventing you from moving