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

renamed 2nd mulligan class

Browse Source
This commit is contained in:
Maxmtg
2013-05-19 20:48:57 +00:00
parent 5246badd68
commit 0936352729
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@@ -14133,7 +14133,7 @@ src/main/java/forge/control/input/InputBlock.java svneol=native#text/plain
src/main/java/forge/control/input/InputCleanup.java svneol=native#text/plain src/main/java/forge/control/input/InputCleanup.java svneol=native#text/plain
src/main/java/forge/control/input/InputLockUI.java -text src/main/java/forge/control/input/InputLockUI.java -text
src/main/java/forge/control/input/InputMulligan.java svneol=native#text/plain src/main/java/forge/control/input/InputMulligan.java svneol=native#text/plain
src/main/java/forge/control/input/InputPartialParisMulligan.java -text src/main/java/forge/control/input/InputMulliganPartialParis.java -text
src/main/java/forge/control/input/InputPassPriority.java svneol=native#text/plain src/main/java/forge/control/input/InputPassPriority.java svneol=native#text/plain
src/main/java/forge/control/input/InputPayManaBase.java -text src/main/java/forge/control/input/InputPayManaBase.java -text
src/main/java/forge/control/input/InputPayManaExecuteCommands.java svneol=native#text/plain src/main/java/forge/control/input/InputPayManaExecuteCommands.java svneol=native#text/plain

4
src/main/java/forge/control/input/InputPartialParisMulligan.java → src/main/java/forge/control/input/InputMulliganPartialParis.java
View File

@@ -43,7 +43,7 @@ import forge.view.ButtonUtil;
* @author Forge * @author Forge
* @version $Id: InputMulligan.java 20698 2013-04-01 09:56:12Z Max mtg $ * @version $Id: InputMulligan.java 20698 2013-04-01 09:56:12Z Max mtg $
*/ */
public class InputPartialParisMulligan extends InputBase { public class InputMulliganPartialParis extends InputBase {
/** Constant <code>serialVersionUID=-8112954303001155622L</code>. */ /** Constant <code>serialVersionUID=-8112954303001155622L</code>. */
private static final long serialVersionUID = -8112954303001155622L; private static final long serialVersionUID = -8112954303001155622L;
@@ -53,7 +53,7 @@ public class InputPartialParisMulligan extends InputBase {
private final List<Card> lastExiled = new ArrayList<Card>(); private final List<Card> lastExiled = new ArrayList<Card>();
private final List<Card> allExiled = new ArrayList<Card>(); private final List<Card> allExiled = new ArrayList<Card>();
public InputPartialParisMulligan(MatchController match0, Player humanPlayer) { public InputMulliganPartialParis(MatchController match0, Player humanPlayer) {
super(humanPlayer); super(humanPlayer);
match = match0; match = match0;
game = match.getCurrentGame(); game = match.getCurrentGame();

2
src/main/java/forge/control/input/InputQueue.java
View File

@@ -127,7 +127,7 @@ public class InputQueue extends MyObservable implements java.io.Serializable {
GameAge age = game.getAge(); GameAge age = game.getAge();
if ( age == GameAge.Mulligan ) { if ( age == GameAge.Mulligan ) {
Player human = Singletons.getControl().getPlayer(); Player human = Singletons.getControl().getPlayer();
return game.getType() == GameType.Commander ? new InputPartialParisMulligan(match, human) : new InputMulligan(match, human); return game.getType() == GameType.Commander ? new InputMulliganPartialParis(match, human) : new InputMulligan(match, human);
} }
if ( age != GameAge.Play ) if ( age != GameAge.Play )