fix combat events again