Exit combat on death; properly handle combat flag