Reset damage time after death and get rid of that MacGyver'd rand location.