fixed combat bugs