From df1aa55d15f8ace5d9b4b7a48c5c495b221d23b3 Mon Sep 17 00:00:00 2001 From: Sol Date: Wed, 22 May 2013 23:14:11 +0000 Subject: [PATCH] - ForceAnte should be used if it's non-null (override ante preference) --- src/main/java/forge/game/MatchController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/forge/game/MatchController.java b/src/main/java/forge/game/MatchController.java index 31c288d09bf..ef5adaa717c 100644 --- a/src/main/java/forge/game/MatchController.java +++ b/src/main/java/forge/game/MatchController.java @@ -69,7 +69,7 @@ public class MatchController { public MatchController(GameType type, Map map, Boolean forceAnte) { this(type, map); if( forceAnte != null ) - this.useAnte |= forceAnte.booleanValue(); + this.useAnte = forceAnte.booleanValue(); } /** @@ -129,7 +129,7 @@ public class MatchController { FThreads.invokeInEdtNowOrLater(new Runnable() { @Override public void run() { - String title = result.isWinner(human) ? "You Win" : "You Lost"; + String title = result.getWinner().getName() + " Won!"; ViewWinLose v = new ViewWinLose(MatchController.this); v.setTitle(title); v.setOutcomes(outcomes);