Fixed Collisions

- for real this time!
- not fully tested so i'll do more work on it tonight
feel free to test it and find any bugs
- added case for MOVE_EXIT on server