diff --git a/app/models/teampointadjust.rb b/app/models/teampointadjust.rb index 9ff18a3..59862c2 100644 --- a/app/models/teampointadjust.rb +++ b/app/models/teampointadjust.rb @@ -14,7 +14,7 @@ class Teampointadjust < ActiveRecord::Base #Team score needs calculated if self.wrestler_id != nil #In case this affects pool order - AdvanceWrestler.new(self.wrestler).advance + AdvanceWrestler.new(self.wrestler,self.wrestler.last_match).advance self.wrestler.school.calculate_score elsif self.school_id != nil self.school.calculate_score diff --git a/app/services/bracket_advancement/advance_wrestler.rb b/app/services/bracket_advancement/advance_wrestler.rb index 40a7d0e..1e69850 100644 --- a/app/services/bracket_advancement/advance_wrestler.rb +++ b/app/services/bracket_advancement/advance_wrestler.rb @@ -14,9 +14,11 @@ class AdvanceWrestler end def advance_raw + if @last_match && @last_match.finished? pool_to_bracket_advancement if @tournament.tournament_type == "Pool to bracket" DoubleEliminationAdvance.new(@wrestler, @last_match).bracket_advancement if @tournament.tournament_type.include? "Modified 16 Man Double Elimination" or - @tournament.tournament_type.include? "Regular Double Elimination" + @tournament.tournament_type.include? "Regular Double Elimination" + end end def pool_to_bracket_advancement