fixed combat null pointer exception