Revert "Re-revert the collision overhaul, but correctly this time (fixes bodyblocking)"

This reverts commit 9f3905b7acb1e2418ba63a335c0c0c5a3ed2b18f.
Initial speedhax
wareya's speedhax