added oncombatevenOverride