Rework combat enter/exit events