From 6f884817fe77d088aeb2917ef10ecebcfe6d2aa5 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Wed, 12 Oct 2011 12:50:29 +0400
Subject: [PATCH] Fixed Proliferate. Fixed Issue 275.

---
 .../abilities/effects/common/counter/ProliferateEffect.java     | 2 +-
 Mage/src/mage/target/common/TargetPermanentOrPlayer.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Mage/src/mage/abilities/effects/common/counter/ProliferateEffect.java b/Mage/src/mage/abilities/effects/common/counter/ProliferateEffect.java
index 973aa83f582..243c979421e 100644
--- a/Mage/src/mage/abilities/effects/common/counter/ProliferateEffect.java
+++ b/Mage/src/mage/abilities/effects/common/counter/ProliferateEffect.java
@@ -68,7 +68,7 @@ public class ProliferateEffect extends OneShotEffect<ProliferateEffect> {
 			Map<String, Serializable> options = new HashMap<String, Serializable>();
 			options.put("UI.right.btn.text", "Done");
 			while (target.canChoose(controller.getId(), game)) {
-				if (!controller.choose(Outcome.Benefit, target, source.getSourceId(), game, options)) {
+				if (controller.choose(Outcome.Benefit, target, source.getSourceId(), game, options)) {
 					break;
 				}
 			}
diff --git a/Mage/src/mage/target/common/TargetPermanentOrPlayer.java b/Mage/src/mage/target/common/TargetPermanentOrPlayer.java
index 231bdb074c9..ace188bacd2 100644
--- a/Mage/src/mage/target/common/TargetPermanentOrPlayer.java
+++ b/Mage/src/mage/target/common/TargetPermanentOrPlayer.java
@@ -173,7 +173,7 @@ public class TargetPermanentOrPlayer extends TargetImpl<TargetPermanentOrPlayer>
 			}
 		}
 		for (Permanent permanent: game.getBattlefield().getActivePermanents(filterPermanent, sourceControllerId, game)) {
-			if (filter.match(permanent, null, sourceControllerId, game)) {
+			if (filter.match(permanent, null, sourceControllerId, game) && filter.match(permanent)) {
 				count++;
 				if (count >= this.minNumberOfTargets)
 					return true;