From 333562f72127a0f4cbdbaa082aa287551b8ecf0b Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Mon, 7 Mar 2011 22:03:35 +0300
Subject: [PATCH] Fixes

---
 ...ealsCombatDamageToAPlayerTriggeredAbility.java |  1 +
 .../decorator/ConditionalTriggeredAbility.java    |  6 +++++-
 .../common/PutLibraryIntoGraveTargetEffect.java   | 15 ++++++++-------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Mage/src/mage/abilities/common/DealsCombatDamageToAPlayerTriggeredAbility.java b/Mage/src/mage/abilities/common/DealsCombatDamageToAPlayerTriggeredAbility.java
index 60cb8d1bab..c3d0523361 100644
--- a/Mage/src/mage/abilities/common/DealsCombatDamageToAPlayerTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/DealsCombatDamageToAPlayerTriggeredAbility.java
@@ -58,6 +58,7 @@ public class DealsCombatDamageToAPlayerTriggeredAbility extends TriggeredAbility
 	@Override
 	public boolean checkTrigger(GameEvent event, Game game) {
 		if (event.getType() == EventType.DAMAGED_PLAYER && event.getSourceId().equals(this.sourceId)) {
+			this.targets.clear();
 			this.addTarget(new TargetPlayer());
 			this.targets.get(0).add(event.getPlayerId(), game);
 			return true;
diff --git a/Mage/src/mage/abilities/decorator/ConditionalTriggeredAbility.java b/Mage/src/mage/abilities/decorator/ConditionalTriggeredAbility.java
index 6b10329884..6dd4736ca8 100644
--- a/Mage/src/mage/abilities/decorator/ConditionalTriggeredAbility.java
+++ b/Mage/src/mage/abilities/decorator/ConditionalTriggeredAbility.java
@@ -47,7 +47,11 @@ public class ConditionalTriggeredAbility extends TriggeredAbilityImpl<Conditiona
 	public boolean checkTrigger(GameEvent event, Game game) {
 		ability.setSourceId(this.getSourceId());
 		if (ability.checkTrigger(event, game)) {
-			return condition.apply(game, this);
+			if (condition.apply(game, this)) {
+				this.targets.clear();
+				this.targets.addAll(ability.getTargets());
+				return true;
+			}
 		}
 		return false;
 	}
diff --git a/Mage/src/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java b/Mage/src/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java
index 87c5c31bd6..dfa00c0cfb 100644
--- a/Mage/src/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java
+++ b/Mage/src/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java
@@ -61,13 +61,14 @@ public class PutLibraryIntoGraveTargetEffect extends OneShotEffect<PutLibraryInt
 	@Override
 	public boolean apply(Game game, Ability source) {
 		Player player = game.getPlayer(source.getFirstTarget());
-		Card card;
-		for (int i = 0; i < amount; i++) {
-			card = player.getLibrary().removeFromTop(game);
-			if (card != null)
-				player.getGraveyard().add(card);
-			else
-				break;
+		if (player != null) {
+			for (int i = 0; i < amount; i++) {
+				Card card = player.getLibrary().removeFromTop(game);
+				if (card != null)
+					player.getGraveyard().add(card);
+				else
+					break;
+			}
 		}
 		return true;
 	}