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 675d32e44ab..1be6974390d 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 @@ -1617,7 +1617,6 @@ public class ComputerPlayer> extends PlayerImpl i * 3. get card colors as chosen starting from most rated card */ protected List chooseDeckColorsIfPossible() { - log.warn(this.getName() + " choose Deck Colors."); if (pickedCards.size() > 2) { // sort by score and color mana symbol count in descending order Collections.sort(pickedCards, new Comparator() { diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/utils/RateCard.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/utils/RateCard.java index e031ca23e21..08f09ce3ed2 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/utils/RateCard.java +++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/utils/RateCard.java @@ -100,7 +100,7 @@ public class RateCard { if (effect.getOutcome().equals(Outcome.DestroyPermanent)) { for (Target target : ability.getTargets()) { if (target instanceof TargetCreaturePermanent) { - log.info("Found destroyer: " + card.getName()); + log.debug("Found destroyer: " + card.getName()); return 1; } } diff --git a/Mage.Sets/src/mage/sets/commander/KaaliaOfTheVast.java b/Mage.Sets/src/mage/sets/commander/KaaliaOfTheVast.java index 99d5a29777c..35884ea3bb2 100644 --- a/Mage.Sets/src/mage/sets/commander/KaaliaOfTheVast.java +++ b/Mage.Sets/src/mage/sets/commander/KaaliaOfTheVast.java @@ -25,13 +25,11 @@ * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. */ - package mage.sets.commander; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.Mode; import mage.constants.CardType; import mage.constants.Rarity; import mage.constants.Zone; @@ -69,13 +67,13 @@ public class KaaliaOfTheVast extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(2); - - // Flying + + // Flying this.addAbility(FlyingAbility.getInstance()); - - // Whenever Kaalia of the Vast attacks an opponent, you may put an Angel, Demon, or Dragon creature card - // from your hand onto the battlefield tapped and attacking that opponent. - this.addAbility(new KaaliaOfTheVastAttacksAbility()); + + // Whenever Kaalia of the Vast attacks an opponent, you may put an Angel, Demon, or Dragon creature card + // from your hand onto the battlefield tapped and attacking that opponent. + this.addAbility(new KaaliaOfTheVastAttacksAbility()); } public KaaliaOfTheVast(final KaaliaOfTheVast card) { @@ -90,29 +88,29 @@ public class KaaliaOfTheVast extends CardImpl { } class KaaliaOfTheVastAttacksAbility extends TriggeredAbilityImpl { - + public KaaliaOfTheVastAttacksAbility() { super(Zone.BATTLEFIELD, new KaaliaOfTheVastEffect(), false); } - + public KaaliaOfTheVastAttacksAbility(final KaaliaOfTheVastAttacksAbility ability) { super(ability); } @Override public boolean checkTrigger(GameEvent event, Game game) { - if (event.getType() == EventType.ATTACKER_DECLARED && event.getSourceId().equals(this.getSourceId()) ) { - Player opponent = game.getPlayer(event.getTargetId()); - if( opponent != null ) { - return true; - } + if (event.getType() == EventType.ATTACKER_DECLARED && event.getSourceId().equals(this.getSourceId())) { + Player opponent = game.getPlayer(event.getTargetId()); + if (opponent != null) { + return true; + } } return false; } @Override public String getRule() { - return "Whenever {this} attacks an opponent, you may put an Angel, Demon, or Dragon creature card from your hand onto the battlefield tapped and attacking that opponent."; + return "Whenever {this} attacks an opponent, you may put an Angel, Demon, or Dragon creature card from your hand onto the battlefield tapped and attacking that opponent."; } @Override @@ -150,8 +148,8 @@ class KaaliaOfTheVastEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); if (player == null || !player.chooseUse(Outcome.PutCreatureInPlay, "Put an Angel, Demon, or Dragon creature card from your hand onto the battlefield tapped and attacking?", game)) { - return false; - } + return false; + } TargetCardInHand target = new TargetCardInHand(filter); if (target.canChoose(player.getId(), game) && target.choose(getOutcome(), player.getId(), source.getSourceId(), game)) { if (target.getTargets().size() > 0) { @@ -159,11 +157,15 @@ class KaaliaOfTheVastEffect extends OneShotEffect { Card card = game.getCard(cardId); if (card != null && game.getCombat() != null) { UUID defenderId = game.getCombat().getDefendingPlayerId(source.getSourceId(), game); - if(defenderId != null) { + if (defenderId != null) { player.getHand().remove(card); - card.moveToZone(Zone.BATTLEFIELD, source.getId(), game, true); - game.getCombat().declareAttacker(card.getId(), defenderId, game); - return true; + player.putOntoBattlefieldWithInfo(card, game, Zone.HAND, source.getSourceId()); + Permanent creature = game.getPermanent(cardId); + if (creature != null) { + game.getCombat().declareAttacker(card.getId(), defenderId, game); + return true; + } + } } } diff --git a/Mage/src/mage/abilities/keyword/IntimidateAbility.java b/Mage/src/mage/abilities/keyword/IntimidateAbility.java index 90441ab593e..d6c9fed674e 100644 --- a/Mage/src/mage/abilities/keyword/IntimidateAbility.java +++ b/Mage/src/mage/abilities/keyword/IntimidateAbility.java @@ -55,10 +55,7 @@ class IntimidateEffect extends RestrictionEffect implements Ma @Override public boolean applies(Permanent permanent, Ability source, Game game) { - if (permanent.getAbilities().containsKey(IntimidateAbility.getInstance().getId())) { - return true; - } - return false; + return permanent.getAbilities().containsKey(IntimidateAbility.getInstance().getId()); } @Override diff --git a/Mage/src/mage/game/draft/DraftCube.java b/Mage/src/mage/game/draft/DraftCube.java index b79a3ffb57b..de1ba64e4db 100644 --- a/Mage/src/mage/game/draft/DraftCube.java +++ b/Mage/src/mage/game/draft/DraftCube.java @@ -70,9 +70,9 @@ public abstract class DraftCube { private static final Logger logger = Logger.getLogger(DraftCube.class); - private static Random rnd = new Random(); - private String name; - private int boosterSize = 15; + private static final Random rnd = new Random(); + private final String name; + private final int boosterSize = 15; protected List cubeCards = new ArrayList(); protected List leftCubeCards = new ArrayList(); @@ -118,7 +118,7 @@ public abstract class DraftCube { booster.add(cardInfo.getCard()); done = true; } else { - logger.error(new StringBuilder(this.getName()).append(" - Card not found: ").append(cardId.getName()).append(":").append(cardId.extension)); + logger.warn(new StringBuilder(this.getName()).append(" - Card not found: ").append(cardId.getName()).append(":").append(cardId.extension)); notValid++; } } else {