Fix crash on death
Merge branch 'master' of https://github.com/PhoenixTeamMC/PhoenixCraft