Merge branch 'master' of http://github.com/LukeShu/leaguer

1 files changed, 7 insertions, 6 deletions

diff --git a/app/models/tournament.rb b/app/models/tournament.rb
index 0b55cb6..fdcdba2 100644
--- a/app/models/tournament.rb
+++ b/app/models/tournament.rb
@@ -78,19 +78,20 @@ class Tournament < ActiveRecord::Base
 		for i in 1..num_matches
 			self.matches.create(name: "Match #{i}", status: 0)
 		end
-		match_num = 0
+		match_num = num_matches-1
 		team_num = 0
 		#for each grouping of min_players_per_team
-		self.players.each_slice(min_players_per_team) do |players|
-			#create a new team in the current match
-			self.matches[match_num].teams.push(Team.create(users: players))
+		players.each_slice(min_players_per_team) do |players|
+
 			#if the match is full, move to the next match, otherwise move to the next team
-			if (team_num != 0 and team_num % max_teams_per_match == 0)
-				match_num += 1
+			if (team_num == min_teams_per_match)
+				match_num -= 1
 				team_num = 0
 			else
 				team_num += 1
 			end
+			#create a new team in the current match
+			self.matches[match_num].teams.push(Team.create(users: players))
 		end
 	end
 end