Movement stopped on collision

The map now properly stops movement when colliding with objects.