Merge origin/master

This commit is contained in:
LevelX2 2015-02-25 23:48:49 +01:00
commit 5670831b62

View file

@ -114,15 +114,15 @@ class AdviceFromTheFaeEffect extends OneShotEffect {
if (game.getBattlefield().countAll(new FilterControlledCreaturePermanent(), controller.getId(), game) > max) { if (game.getBattlefield().countAll(new FilterControlledCreaturePermanent(), controller.getId(), game) > max) {
TargetCard target = new TargetCard(2, Zone.LIBRARY, new FilterCard()); TargetCard target = new TargetCard(2, Zone.LIBRARY, new FilterCard());
if (controller.choose(Outcome.DrawCard, cards, target, game)) { if (controller.choose(Outcome.DrawCard, cards, target, game)) {
controller.moveCardToHandWithInfo(game.getCard(target.getFirstTarget()), source.getId(), game, Zone.LIBRARY); controller.moveCardToHandWithInfo(game.getCard(target.getFirstTarget()), source.getSourceId(), game, Zone.LIBRARY);
cards.remove(game.getCard(target.getFirstTarget())); cards.remove(game.getCard(target.getFirstTarget()));
controller.moveCardToHandWithInfo(game.getCard(target.getTargets().get(1)), source.getId(), game, Zone.LIBRARY); controller.moveCardToHandWithInfo(game.getCard(target.getTargets().get(1)), source.getSourceId(), game, Zone.LIBRARY);
cards.remove(game.getCard(target.getTargets().get(1))); cards.remove(game.getCard(target.getTargets().get(1)));
} }
} else { } else {
TargetCard target = new TargetCard(1, Zone.LIBRARY, new FilterCard()); TargetCard target = new TargetCard(1, Zone.LIBRARY, new FilterCard());
if (controller.choose(Outcome.DrawCard, cards, target, game)) { if (controller.choose(Outcome.DrawCard, cards, target, game)) {
controller.moveCardToHandWithInfo(game.getCard(target.getFirstTarget()), source.getId(), game, Zone.LIBRARY); controller.moveCardToHandWithInfo(game.getCard(target.getFirstTarget()), source.getSourceId(), game, Zone.LIBRARY);
cards.remove(game.getCard(target.getFirstTarget())); cards.remove(game.getCard(target.getFirstTarget()));
} }
} }