mirror of
https://github.com/correl/mage.git
synced 2024-12-25 03:00:15 +00:00
* Fixed a bug that if opponent left tournament during a match, get got points for that mathc if he won more games (fixes #1310).
This commit is contained in:
parent
f4b667650c
commit
673cd6b38a
1 changed files with 30 additions and 33 deletions
|
@ -25,7 +25,6 @@
|
||||||
* authors and should not be interpreted as representing official policies, either expressed
|
* authors and should not be interpreted as representing official policies, either expressed
|
||||||
* or implied, of BetaSteward_at_googlemail.com.
|
* or implied, of BetaSteward_at_googlemail.com.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package mage.game.tournament;
|
package mage.game.tournament;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
@ -276,9 +275,9 @@ public abstract class TournamentImpl implements Tournament {
|
||||||
tp2.setResults(addRoundResult(round.getRoundNumber(), pair, tp2, tp1));
|
tp2.setResults(addRoundResult(round.getRoundNumber(), pair, tp2, tp1));
|
||||||
|
|
||||||
// Add points
|
// Add points
|
||||||
if (mp2.hasQuit() || mp1.getWins() > mp2.getWins()) {
|
if ((!mp1.hasQuit() && mp1.getWins() > mp2.getWins()) || mp2.hasQuit()) {
|
||||||
tp1.setPoints(tp1.getPoints() + 3);
|
tp1.setPoints(tp1.getPoints() + 3);
|
||||||
} else if (mp1.hasQuit() || mp1.getWins() < mp2.getWins()) {
|
} else if ((!mp2.hasQuit() && mp1.getWins() < mp2.getWins()) || mp1.hasQuit()) {
|
||||||
tp2.setPoints(tp2.getPoints() + 3);
|
tp2.setPoints(tp2.getPoints() + 3);
|
||||||
} else {
|
} else {
|
||||||
tp1.setPoints(tp1.getPoints() + 1);
|
tp1.setPoints(tp1.getPoints() + 1);
|
||||||
|
@ -372,7 +371,6 @@ public abstract class TournamentImpl implements Tournament {
|
||||||
}
|
}
|
||||||
// add autosubmit trigger
|
// add autosubmit trigger
|
||||||
|
|
||||||
|
|
||||||
synchronized (this) {
|
synchronized (this) {
|
||||||
while (!isDoneConstructing()) {
|
while (!isDoneConstructing()) {
|
||||||
try {
|
try {
|
||||||
|
@ -509,7 +507,6 @@ public abstract class TournamentImpl implements Tournament {
|
||||||
this.startTime = new Date();
|
this.startTime = new Date();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setStepStartTime(Date stepStartTime) {
|
public void setStepStartTime(Date stepStartTime) {
|
||||||
this.stepStartTime = stepStartTime;
|
this.stepStartTime = stepStartTime;
|
||||||
|
|
Loading…
Reference in a new issue