r17604 was not merged properly in r17621

This commit is contained in:
Maxmtg
2012-10-23 04:28:31 +00:00
parent 067dfef2c3
commit f80ab95506

View File

@@ -126,7 +126,11 @@ public class QuestWinLose extends ControlWinLose {
LobbyPlayer questPlayer = Singletons.getControl().getLobby().getQuestPlayer();
if (isAnte) {
//do per-game actions
boolean isHumanWinner = match.isWonBy(questPlayer);
GameOutcome outcome = match.getLastGameOutcome();
// Ante returns to owners in a draw
if (!outcome.isDraw()) {
boolean isHumanWinner = outcome.getWinner().equals(questPlayer);
final List<CardPrinted> anteCards = new ArrayList<CardPrinted>();
for( Player p : Singletons.getModel().getGame().getPlayers() ) {
if (p.getLobbyPlayer().equals(questPlayer) == isHumanWinner) continue;
@@ -143,6 +147,7 @@ public class QuestWinLose extends ControlWinLose {
this.anteLost(anteCards);
}
}
}
if (!match.isMatchOver()) {
this.getView().getBtnQuit().setText("Quit (15 Credits)");