fixed combat bug