fix combat bug