external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

r17604 was not merged properly in r17621

Browse Source
This commit is contained in:
Maxmtg
2012-10-23 04:28:31 +00:00
parent 067dfef2c3
commit f80ab95506
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/forge/gui/match/QuestWinLose.java
View File

@@ -126,7 +126,11 @@ public class QuestWinLose extends ControlWinLose {
LobbyPlayer questPlayer = Singletons.getControl().getLobby().getQuestPlayer(); LobbyPlayer questPlayer = Singletons.getControl().getLobby().getQuestPlayer();
if (isAnte) { if (isAnte) {
//do per-game actions //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>(); final List<CardPrinted> anteCards = new ArrayList<CardPrinted>();
for( Player p : Singletons.getModel().getGame().getPlayers() ) { for( Player p : Singletons.getModel().getGame().getPlayers() ) {
if (p.getLobbyPlayer().equals(questPlayer) == isHumanWinner) continue; if (p.getLobbyPlayer().equals(questPlayer) == isHumanWinner) continue;
@@ -143,6 +147,7 @@ public class QuestWinLose extends ControlWinLose {
this.anteLost(anteCards); this.anteLost(anteCards);
} }
} }
}
if (!match.isMatchOver()) { if (!match.isMatchOver()) {
this.getView().getBtnQuit().setText("Quit (15 Credits)"); this.getView().getBtnQuit().setText("Quit (15 Credits)");