@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | $this->championship = $championship; |
| 26 | 26 | $this->names = $names; |
| 27 | 27 | |
| 28 | - $this->firstRoundName = $names->first()->map(function ($item, $key) use ($championship) { |
|
| 28 | + $this->firstRoundName = $names->first()->map(function($item, $key) use ($championship) { |
|
| 29 | 29 | $fighters = $item->getFighters(); |
| 30 | 30 | $fighter1 = $fighters->get(0); |
| 31 | 31 | $fighter2 = $fighters->get(1); |
@@ -77,12 +77,12 @@ discard block |
||
| 77 | 77 | |
| 78 | 78 | for ($roundNumber += 1; $roundNumber <= $this->noRounds; $roundNumber++) { |
| 79 | 79 | for ($matchNumber = 1; $matchNumber <= ($this->noTeams / pow(2, $roundNumber)); $matchNumber++) { |
| 80 | - if ($this->championship->category->isTeam()){ |
|
| 81 | - $fighter1 = $this->names->get($roundNumber)[0]->fights[$matchNumber-1]->team1; |
|
| 82 | - $fighter2 = $this->names->get($roundNumber)[0]->fights[$matchNumber-1]->team2; |
|
| 83 | - }else{ |
|
| 84 | - $fighter1 = $this->names->get($roundNumber)[$matchNumber-1]->fights[0]->competitor1; |
|
| 85 | - $fighter2 = $this->names->get($roundNumber)[$matchNumber-1]->fights[0]->competitor2; |
|
| 80 | + if ($this->championship->category->isTeam()) { |
|
| 81 | + $fighter1 = $this->names->get($roundNumber)[0]->fights[$matchNumber - 1]->team1; |
|
| 82 | + $fighter2 = $this->names->get($roundNumber)[0]->fights[$matchNumber - 1]->team2; |
|
| 83 | + } else { |
|
| 84 | + $fighter1 = $this->names->get($roundNumber)[$matchNumber - 1]->fights[0]->competitor1; |
|
| 85 | + $fighter2 = $this->names->get($roundNumber)[$matchNumber - 1]->fights[0]->competitor2; |
|
| 86 | 86 | } |
| 87 | 87 | $this->brackets[$roundNumber][$matchNumber] = [$fighter1, $fighter2]; |
| 88 | 88 | } |
@@ -65,7 +65,9 @@ discard block |
||
| 65 | 65 | $matches = array_chunk($fighters, 2); |
| 66 | 66 | |
| 67 | 67 | //If there's already a match in the match array, then that means the next round is round 2, so increase the round number |
| 68 | - if (count($this->brackets)) $roundNumber++; |
|
| 68 | + if (count($this->brackets)) { |
|
| 69 | + $roundNumber++; |
|
| 70 | + } |
|
| 69 | 71 | |
| 70 | 72 | $countMatches = count($matches); |
| 71 | 73 | //Create the first full round of fighters, some may be blank if waiting on the results of a previous round |
@@ -80,7 +82,7 @@ discard block |
||
| 80 | 82 | if ($this->championship->category->isTeam()){ |
| 81 | 83 | $fighter1 = $this->names->get($roundNumber)[0]->fights[$matchNumber-1]->team1; |
| 82 | 84 | $fighter2 = $this->names->get($roundNumber)[0]->fights[$matchNumber-1]->team2; |
| 83 | - }else{ |
|
| 85 | + } else{ |
|
| 84 | 86 | $fighter1 = $this->names->get($roundNumber)[$matchNumber-1]->fights[0]->competitor1; |
| 85 | 87 | $fighter2 = $this->names->get($roundNumber)[$matchNumber-1]->fights[0]->competitor2; |
| 86 | 88 | } |