Rearranged code to remove the issue of a person damaging themselves being reported in chat. Fixes #11