Unverified Commit 043bafdb authored by Simon Esposito's avatar Simon Esposito Committed by GitHub
Browse files

Resolve matchmaker regression 

Resolve an issue that would cause the matchmaker to not match two suitable opponents.

Resolves #827
parent 75dee504

server/matchmaker.go

+9 −6
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ func (m *LocalMatchmaker) process(batch *index.Batch) { 


	for ticket, index := range m.activeIndexes {

		index.Intervals++

		lastInterval := index.Intervals > m.config.GetMatchmaker().MaxIntervals || index.MinCount == index.MaxCount

		lastInterval := index.Intervals >= m.config.GetMatchmaker().MaxIntervals || index.MinCount == index.MaxCount

		if lastInterval {

			// Drop from active indexes if it has reached its max intervals, or if its min/max counts are equal. In the

			// latter case keeping it active would have the same result as leaving it in the pool, so this saves work.
@@ -302,15 +302,18 @@ func (m *LocalMatchmaker) process(batch *index.Batch) { 
			continue

		}



		for idx, hit := range blugeMatches.Hits {

			if hit.ID == ticket {

				// Remove the current ticket.

				blugeMatches.Hits = append(blugeMatches.Hits[:idx], blugeMatches.Hits[idx+1:]...)

				break

			}

		}



		// Form possible combinations, in case multiple matches might be suitable.

		entryCombos := make([][]*MatchmakerEntry, 0, 5)

		lastHitCounter := len(blugeMatches.Hits) - 1

		for hitCounter, hit := range blugeMatches.Hits {

			if hit.ID == ticket {

				// Skip the current ticket.

				continue

			}



			hitIndex, ok := m.indexes[hit.ID]

			if !ok {

				// Ticket did not exist, should not happen.