Fixed Fight controller so start and end battles run correctly