Merge branch 'bugfix/buchholzcut-fix' into develop

This commit is contained in:
Jeroen De Meerleer 2019-06-01 14:28:30 +02:00
commit 7ff79c2224
Signed by: JeroenED
GPG Key ID: 28CCCB8F62BFADD6
2 changed files with 5 additions and 5 deletions

View File

@ -231,7 +231,7 @@ class Pairtwo6 extends Pairtwo6Model implements ReaderInterface
$tiebreak = Tiebreak::BuchholzMed; $tiebreak = Tiebreak::BuchholzMed;
break; break;
case 3: case 3:
$tiebreak = Tiebreak::BuchholzMed; $tiebreak = Tiebreak::BuchholzCut;
break; break;
case 4: case 4:
$tiebreak = Tiebreak::Sonneborn; $tiebreak = Tiebreak::Sonneborn;

View File

@ -205,14 +205,14 @@ abstract class Tiebreaks extends Tournament
return 1; return 1;
} }
if ($b->getOpponent()->getElo('Nation') == $a->getOpponent()->getElo('Nation')) { if ($b->getOpponent()->getPoints() == $a->getOpponent()->getPoints()) {
return 0; return 0;
} }
return ($b->getOpponent()->getElo('Nation') > $a->getOpponent()->getElo('Nation')) ? 1 : -1; return ($a->getOpponent()->getPoints() > $b->getOpponent()->getPoints()) ? 1 : -1;
}); });
array_slice($intpairings, $cutlowest); $intpairings = array_slice($intpairings, $cutlowest);
array_slice($intpairings, 0 - $cuthighest); $intpairings = array_slice($intpairings, 0 - $cuthighest);
foreach ($intpairings as $intkey => $intpairing) { foreach ($intpairings as $intkey => $intpairing) {
if (!is_null($intpairing->getOpponent())) { if (!is_null($intpairing->getOpponent())) {