Attempt to fix collision after death issue
Merge branch 'master' of https://github.com/bjorfoss/XNAX1