Fixed combat so that next player is allowed to take its turn