diff --git a/Mage.Tests/plugins/mage-player-ai-ma.jar b/Mage.Tests/plugins/mage-player-ai-ma.jar index c9cc6732d2..d8d96ca6da 100644 Binary files a/Mage.Tests/plugins/mage-player-ai-ma.jar and b/Mage.Tests/plugins/mage-player-ai-ma.jar differ diff --git a/Mage.Tests/plugins/mage-player-ai.jar b/Mage.Tests/plugins/mage-player-ai.jar index 7c22e8cd91..152af7c1b8 100644 Binary files a/Mage.Tests/plugins/mage-player-ai.jar and b/Mage.Tests/plugins/mage-player-ai.jar differ diff --git a/Mage.Tests/plugins/mage-player-aimcts.jar b/Mage.Tests/plugins/mage-player-aimcts.jar index c586e569bf..a3d2089b02 100644 Binary files a/Mage.Tests/plugins/mage-player-aimcts.jar and b/Mage.Tests/plugins/mage-player-aimcts.jar differ diff --git a/Mage.Tests/plugins/mage-player-aiminimax.jar b/Mage.Tests/plugins/mage-player-aiminimax.jar index e0af01d288..9f8516089c 100644 Binary files a/Mage.Tests/plugins/mage-player-aiminimax.jar and b/Mage.Tests/plugins/mage-player-aiminimax.jar differ diff --git a/Mage.Tests/plugins/mage-player-human.jar b/Mage.Tests/plugins/mage-player-human.jar index f55588656b..61d79465e3 100644 Binary files a/Mage.Tests/plugins/mage-player-human.jar and b/Mage.Tests/plugins/mage-player-human.jar differ diff --git a/Mage.Tests/src/test/java/org/mage/test/player/RandomPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/RandomPlayer.java index fa20172a5b..d771ac81a5 100644 --- a/Mage.Tests/src/test/java/org/mage/test/player/RandomPlayer.java +++ b/Mage.Tests/src/test/java/org/mage/test/player/RandomPlayer.java @@ -27,23 +27,10 @@ */ package org.mage.test.player; -import java.io.Serializable; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.Set; -import java.util.UUID; -import mage.Constants; import mage.Constants.Outcome; import mage.Constants.RangeOfInfluence; import mage.Constants.Zone; -import mage.abilities.Ability; -import mage.abilities.ActivatedAbility; -import mage.abilities.Mode; -import mage.abilities.Modes; -import mage.abilities.TriggeredAbilities; -import mage.abilities.TriggeredAbility; +import mage.abilities.*; import mage.abilities.common.PassAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.costs.mana.ManaCost; @@ -63,7 +50,9 @@ import mage.players.Player; import mage.target.Target; import mage.target.TargetAmount; import mage.target.TargetCard; -import org.apache.log4j.Logger; + +import java.io.Serializable; +import java.util.*; /** * @@ -194,7 +183,7 @@ public class RandomPlayer extends ComputerPlayer<RandomPlayer> { } @Override - public void selectAttackers(Game game) { + public void selectAttackers(Game game, UUID attackingPlayerId) { //useful only for two player games - will only attack first opponent UUID defenderId = game.getOpponents(playerId).iterator().next(); List<Permanent> attackersList = super.getAvailableAttackers(game); @@ -214,7 +203,7 @@ public class RandomPlayer extends ComputerPlayer<RandomPlayer> { } @Override - public void selectBlockers(Game game) { + public void selectBlockers(Game game, UUID defendingPlayerId) { int numGroups = game.getCombat().getGroups().size(); if (numGroups == 0) return; diff --git a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java index 19c3a4b967..787f844be9 100644 --- a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java +++ b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java @@ -128,7 +128,7 @@ public class TestPlayer extends ComputerPlayer<TestPlayer> { } @Override - public void selectAttackers(Game game) { + public void selectAttackers(Game game, UUID attackingPlayerId) { UUID opponentId = game.getCombat().getDefenders().iterator().next(); for (PlayerAction action: actions) { if (action.getTurnNum() == game.getTurnNum() && action.getAction().startsWith("attack:")) { @@ -145,7 +145,7 @@ public class TestPlayer extends ComputerPlayer<TestPlayer> { } @Override - public void selectBlockers(Game game) { + public void selectBlockers(Game game, UUID defendingPlayerId) { UUID opponentId = game.getOpponents(playerId).iterator().next(); for (PlayerAction action: actions) { if (action.getTurnNum() == game.getTurnNum() && action.getAction().startsWith("block:")) {