github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 11:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Commander - Players no longer go to a sideboarding phase during caommander matches.

Browse source
This commit is contained in:
LevelX2 2014-11-07 14:24:07 +01:00
parent 70fa982f7c
commit 751365124e
6 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Mage.Server.Plugins/Mage.Game.CommanderDuel/src/mage/game/CommanderDuelType.java
View file

@ -43,6 +43,7 @@ public class CommanderDuelType extends MatchType {
this.numTeams = 0; this.numTeams = 0;
this.useAttackOption = false; this.useAttackOption = false;
this.useRange = false; this.useRange = false;
this.sideboardingAllowed = false;
} }
protected CommanderDuelType(final CommanderDuelType matchType) { protected CommanderDuelType(final CommanderDuelType matchType) {

1
Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/src/mage/game/CommanderFreeForAllType.java
View file

@ -44,6 +44,7 @@ public class CommanderFreeForAllType extends MatchType {
this.numTeams = 0; this.numTeams = 0;
this.useAttackOption = true; this.useAttackOption = true;
this.useRange = true; this.useRange = true;
this.sideboardingAllowed = false;
} }
protected CommanderFreeForAllType(final CommanderFreeForAllType matchType) { protected CommanderFreeForAllType(final CommanderFreeForAllType matchType) {

1
Mage.Server.Plugins/Mage.Game.FreeForAll/src/mage/game/FreeForAllType.java
View file

@ -43,6 +43,7 @@ public class FreeForAllType extends MatchType {
this.numTeams = 0; this.numTeams = 0;
this.useAttackOption = true; this.useAttackOption = true;
this.useRange = true; this.useRange = true;
this.sideboardingAllowed = true;
} }
protected FreeForAllType(final FreeForAllType matchType) { protected FreeForAllType(final FreeForAllType matchType) {

1
Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuelType.java
View file

@ -43,6 +43,7 @@ public class TwoPlayerDuelType extends MatchType {
this.numTeams = 0; this.numTeams = 0;
this.useAttackOption = false; this.useAttackOption = false;
this.useRange = false; this.useRange = false;
this.sideboardingAllowed = true;
} }
protected TwoPlayerDuelType(final TwoPlayerDuelType matchType) { protected TwoPlayerDuelType(final TwoPlayerDuelType matchType) {

2
Mage.Server/src/main/java/mage/server/TableController.java
View file

@ -735,7 +735,9 @@ public class TableController {
GameManager.getInstance().removeGame(game.getId()); GameManager.getInstance().removeGame(game.getId());
try { try {
if (!match.hasEnded()) { if (!match.hasEnded()) {
if (match.getGame().getGameType().isSideboardingAllowed()) {
sideboard(); sideboard();
}
if (!match.hasEnded()) { if (!match.hasEnded()) {
startGame(choosingPlayerId); startGame(choosingPlayerId);
} else { } else {

6
Mage/src/mage/game/match/MatchType.java
View file

@ -43,6 +43,7 @@ public abstract class MatchType implements Serializable {
protected int playersPerTeam; protected int playersPerTeam;
protected boolean useRange; protected boolean useRange;
protected boolean useAttackOption; protected boolean useAttackOption;
protected boolean sideboardingAllowed;
protected MatchType() {} protected MatchType() {}
@ -54,6 +55,7 @@ public abstract class MatchType implements Serializable {
this.playersPerTeam = matchType.playersPerTeam; this.playersPerTeam = matchType.playersPerTeam;
this.useRange = matchType.useRange; this.useRange = matchType.useRange;
this.useAttackOption = matchType.useAttackOption; this.useAttackOption = matchType.useAttackOption;
this.sideboardingAllowed = matchType.sideboardingAllowed;
} }
public abstract MatchType copy(); public abstract MatchType copy();
@ -91,4 +93,8 @@ public abstract class MatchType implements Serializable {
return useAttackOption; return useAttackOption;
} }
public boolean isSideboardingAllowed() {
return sideboardingAllowed;
}
} }