diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestCommander3PlayersFFA.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestCommander3PlayersFFA.java index d06c9c2789..91ab6ba035 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestCommander3PlayersFFA.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestCommander3PlayersFFA.java @@ -25,9 +25,9 @@ public abstract class CardTestCommander3PlayersFFA extends CardTestPlayerAPIImpl @Override protected Game createNewGameAndPlayers() throws GameException, FileNotFoundException { Game game = new CommanderFreeForAll(MultiplayerAttackOption.MULTIPLE, RangeOfInfluence.ONE, MulliganType.GAME_DEFAULT.getMulligan(0), 40); - playerA = createPlayer(game, playerA, "PlayerA", deckNameA); - playerB = createPlayer(game, playerB, "PlayerB", deckNameB); - playerC = createPlayer(game, playerC, "PlayerC", deckNameC); + playerA = createPlayer(game, "PlayerA", deckNameA); + playerB = createPlayer(game, "PlayerB", deckNameB); + playerC = createPlayer(game, "PlayerC", deckNameC); return game; } diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestCommanderDuelBase.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestCommanderDuelBase.java index 6631e73d5e..bb631c759d 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestCommanderDuelBase.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestCommanderDuelBase.java @@ -25,8 +25,8 @@ public abstract class CardTestCommanderDuelBase extends CardTestPlayerAPIImpl { protected Game createNewGameAndPlayers() throws GameException, FileNotFoundException { Game game = new CommanderDuel(MultiplayerAttackOption.LEFT, RangeOfInfluence.ONE, MulliganType.GAME_DEFAULT.getMulligan(0), 40); - playerA = createPlayer(game, playerA, "PlayerA", deckNameA); - playerB = createPlayer(game, playerB, "PlayerB", deckNameB); + playerA = createPlayer(game, "PlayerA", deckNameA); + playerB = createPlayer(game, "PlayerB", deckNameB); return game; } diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestOathbreaker3PlayersFFA.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestOathbreaker3PlayersFFA.java index e9e3bf34de..fd174f2f82 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestOathbreaker3PlayersFFA.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestOathbreaker3PlayersFFA.java @@ -24,9 +24,9 @@ public abstract class CardTestOathbreaker3PlayersFFA extends CardTestPlayerAPIIm @Override protected Game createNewGameAndPlayers() throws GameException, FileNotFoundException { Game game = new OathbreakerFreeForAll(MultiplayerAttackOption.MULTIPLE, RangeOfInfluence.ONE, MulliganType.GAME_DEFAULT.getMulligan(0), 20); - playerA = createPlayer(game, playerA, "PlayerA", deckNameA); - playerB = createPlayer(game, playerB, "PlayerB", deckNameB); - playerC = createPlayer(game, playerC, "PlayerC", deckNameC); + playerA = createPlayer(game, "PlayerA", deckNameA); + playerB = createPlayer(game, "PlayerB", deckNameB); + playerC = createPlayer(game, "PlayerC", deckNameC); return game; } diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestPlayerBase.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestPlayerBase.java index 484c6e9065..a693038e67 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestPlayerBase.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/CardTestPlayerBase.java @@ -26,8 +26,8 @@ public abstract class CardTestPlayerBase extends CardTestPlayerAPIImpl { protected Game createNewGameAndPlayers() throws GameException, FileNotFoundException { Game game = new TwoPlayerDuel(MultiplayerAttackOption.LEFT, RangeOfInfluence.ONE, MulliganType.GAME_DEFAULT.getMulligan(0), 20); - playerA = createPlayer(game, playerA, "PlayerA", deckNameA); - playerB = createPlayer(game, playerB, "PlayerB", deckNameB); + playerA = createPlayer(game, "PlayerA", deckNameA); + playerB = createPlayer(game, "PlayerB", deckNameB); return game; } diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java index 82c2d8989f..636625c3a8 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/impl/CardTestPlayerAPIImpl.java @@ -253,11 +253,11 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement abstract protected Game createNewGameAndPlayers() throws GameException, FileNotFoundException; protected TestPlayer createPlayer(Game game, TestPlayer player, String name) throws GameException { - return createPlayer(game, player, name, "RB Aggro.dck"); + return createPlayer(game, name, "RB Aggro.dck"); } - protected TestPlayer createPlayer(Game game, TestPlayer player, String name, String deckName) throws GameException { - player = createNewPlayer(name, game.getRangeOfInfluence()); + protected TestPlayer createPlayer(Game game, String name, String deckName) throws GameException { + TestPlayer player = createNewPlayer(name, game.getRangeOfInfluence()); player.setTestMode(true); logger.debug("Loading deck...");