Revert "Refactore consecutive collision detection code"

This reverts commit 6d404b71ba1b9c43374b551942e02931a04e3ab7.
Refactored collision code again
Fix (hope so) consecutive collision detection