mirror of
https://github.com/correl/mage.git
synced 2024-12-26 03:00:11 +00:00
* Commander - Players no longer go to a sideboarding phase during caommander matches.
This commit is contained in:
parent
70fa982f7c
commit
751365124e
6 changed files with 13 additions and 1 deletions
|
@ -43,6 +43,7 @@ public class CommanderDuelType extends MatchType {
|
|||
this.numTeams = 0;
|
||||
this.useAttackOption = false;
|
||||
this.useRange = false;
|
||||
this.sideboardingAllowed = false;
|
||||
}
|
||||
|
||||
protected CommanderDuelType(final CommanderDuelType matchType) {
|
||||
|
|
|
@ -44,6 +44,7 @@ public class CommanderFreeForAllType extends MatchType {
|
|||
this.numTeams = 0;
|
||||
this.useAttackOption = true;
|
||||
this.useRange = true;
|
||||
this.sideboardingAllowed = false;
|
||||
}
|
||||
|
||||
protected CommanderFreeForAllType(final CommanderFreeForAllType matchType) {
|
||||
|
|
|
@ -43,6 +43,7 @@ public class FreeForAllType extends MatchType {
|
|||
this.numTeams = 0;
|
||||
this.useAttackOption = true;
|
||||
this.useRange = true;
|
||||
this.sideboardingAllowed = true;
|
||||
}
|
||||
|
||||
protected FreeForAllType(final FreeForAllType matchType) {
|
||||
|
|
|
@ -43,6 +43,7 @@ public class TwoPlayerDuelType extends MatchType {
|
|||
this.numTeams = 0;
|
||||
this.useAttackOption = false;
|
||||
this.useRange = false;
|
||||
this.sideboardingAllowed = true;
|
||||
}
|
||||
|
||||
protected TwoPlayerDuelType(final TwoPlayerDuelType matchType) {
|
||||
|
|
|
@ -735,7 +735,9 @@ public class TableController {
|
|||
GameManager.getInstance().removeGame(game.getId());
|
||||
try {
|
||||
if (!match.hasEnded()) {
|
||||
if (match.getGame().getGameType().isSideboardingAllowed()) {
|
||||
sideboard();
|
||||
}
|
||||
if (!match.hasEnded()) {
|
||||
startGame(choosingPlayerId);
|
||||
} else {
|
||||
|
|
|
@ -43,6 +43,7 @@ public abstract class MatchType implements Serializable {
|
|||
protected int playersPerTeam;
|
||||
protected boolean useRange;
|
||||
protected boolean useAttackOption;
|
||||
protected boolean sideboardingAllowed;
|
||||
|
||||
protected MatchType() {}
|
||||
|
||||
|
@ -54,6 +55,7 @@ public abstract class MatchType implements Serializable {
|
|||
this.playersPerTeam = matchType.playersPerTeam;
|
||||
this.useRange = matchType.useRange;
|
||||
this.useAttackOption = matchType.useAttackOption;
|
||||
this.sideboardingAllowed = matchType.sideboardingAllowed;
|
||||
}
|
||||
|
||||
public abstract MatchType copy();
|
||||
|
@ -91,4 +93,8 @@ public abstract class MatchType implements Serializable {
|
|||
return useAttackOption;
|
||||
}
|
||||
|
||||
public boolean isSideboardingAllowed() {
|
||||
return sideboardingAllowed;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue