mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-15 18:28:00 +00:00
- ForceAnte should be used if it's non-null (override ante preference)
This commit is contained in:
@@ -69,7 +69,7 @@ public class MatchController {
|
|||||||
public MatchController(GameType type, Map<LobbyPlayer, PlayerStartConditions> map, Boolean forceAnte) {
|
public MatchController(GameType type, Map<LobbyPlayer, PlayerStartConditions> map, Boolean forceAnte) {
|
||||||
this(type, map);
|
this(type, map);
|
||||||
if( forceAnte != null )
|
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() {
|
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);
|
ViewWinLose v = new ViewWinLose(MatchController.this);
|
||||||
v.setTitle(title);
|
v.setTitle(title);
|
||||||
v.setOutcomes(outcomes);
|
v.setOutcomes(outcomes);
|
||||||
|
|||||||
Reference in New Issue
Block a user