collision event fix
Merge branch 'master' of https://github.com/ty1824/crush