From ae38095c58eacb7bbab3293ac923df2b03d2d37f Mon Sep 17 00:00:00 2001 From: Derek Monturo Date: Thu, 11 May 2017 12:12:20 -0400 Subject: [PATCH] merge --- .../condition/common/CardsInAnyLibraryCondition.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/condition/common/CardsInAnyLibraryCondition.java b/Mage/src/main/java/mage/abilities/condition/common/CardsInAnyLibraryCondition.java index 9cd12424f9..e82566d25a 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/CardsInAnyLibraryCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/CardsInAnyLibraryCondition.java @@ -50,17 +50,19 @@ public class CardsInAnyLibraryCondition implements Condition { @Override public final boolean apply(Game game, Ability source) { + + boolean libraryWith20OrFewerCards = false; Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) { Player player = game.getPlayer(playerId); - if (player != null) { - return ComparisonType.compare(player.getLibrary().size(), type, value); - + if (player != null && ComparisonType.compare(player.getLibrary().size(), type, value)) { + libraryWith20OrFewerCards = true; + break; } } } - return false; + return libraryWith20OrFewerCards; } @Override