From b60cd3d40e98595ff33e47595f6ce1b0c409fa85 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 28 Jan 2018 01:14:50 +0100 Subject: [PATCH] Removed debug command. --- .../main/java/mage/player/ai/ComputerPlayer.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java index 048d7e8907..5269696dd6 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java @@ -126,13 +126,13 @@ public class ComputerPlayer extends PlayerImpl implements Player { @Override public boolean chooseMulligan(Game game) { log.debug("chooseMulligan"); - if (hand.size() < 6 - || isTestMode() + if (hand.size() < 6 + || isTestMode() || game.getClass().getName().contains("Momir")) { return false; } Set lands = hand.getCards(new FilterLandCard(), game); - return lands.size() < 2 + return lands.size() < 2 || lands.size() > hand.size() - 2; } @@ -149,7 +149,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { } // sometimes a target selection can be made from a player that does not control the ability UUID abilityControllerId = playerId; - if (target.getTargetController() != null + if (target.getTargetController() != null && target.getAbilityController() != null) { abilityControllerId = target.getAbilityController(); } @@ -1413,7 +1413,6 @@ public class ComputerPlayer extends PlayerImpl implements Player { @Override public boolean chooseTarget(Outcome outcome, Cards cards, TargetCard target, Ability source, Game game) { - log.debug("chooseTarget"); if (cards == null || cards.isEmpty()) { return target.isRequired(source); } @@ -1633,12 +1632,12 @@ public class ComputerPlayer extends PlayerImpl implements Player { } public static Deck buildDeck(List cardPool, final List colors) { - return buildDeck(cardPool, colors, false); + return buildDeck(cardPool, colors, false); } public static Deck buildDeck(List cardPool, final List colors, boolean onlyBasicLands) { if (onlyBasicLands) { - return buildDeckWithOnlyBasicLands(cardPool); + return buildDeckWithOnlyBasicLands(cardPool); } else { return buildDeckWithNormalCards(cardPool, colors); }