fix combat event managment