From 4bd5639573824d7d351e536f0c1b8bb2d01c25e0 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Fri, 13 May 2011 17:49:26 +0400
Subject: [PATCH] Fixed Tel-Jilad Fallen, Protean Hydra, Sword of Body and
 Mind, Oran-Rief, the Vastwood (Fixed Issue 101)

---
 Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java           | 2 +-
 Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladFallen.java   | 2 ++
 Mage.Sets/src/mage/sets/zendikar/OranRiefTheVastwood.java     | 1 +
 .../effects/common/PutLibraryIntoGraveTargetEffect.java       | 4 +++-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java b/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java
index 5dd5979935..52e743ff43 100644
--- a/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java
+++ b/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java
@@ -218,7 +218,7 @@ public class ProteanHydra extends CardImpl<ProteanHydra> {
 
 		@Override
 		public boolean checkTrigger(GameEvent event, Game game) {
-			if (event.getType() == EventType.END_TURN_STEP_PRE && event.getPlayerId().equals(this.controllerId)) {
+			if (event.getType() == EventType.END_TURN_STEP_PRE) {
 				return true;
 			}
 			return false;
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladFallen.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladFallen.java
index 05df2d2ba8..0f59df54ba 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladFallen.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TelJiladFallen.java
@@ -33,6 +33,7 @@ import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.keyword.InfectAbility;
 import mage.abilities.keyword.ProtectionAbility;
 import mage.cards.CardImpl;
 import mage.filter.common.FilterArtifactCard;
@@ -52,6 +53,7 @@ public class TelJiladFallen extends CardImpl<TelJiladFallen> {
 		this.color.setGreen(true);
         this.power = new MageInt(3);
         this.toughness = new MageInt(1);
+	    this.addAbility(InfectAbility.getInstance());
 	    this.addAbility(new ProtectionAbility(new FilterArtifactCard("artifacts")));
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikar/OranRiefTheVastwood.java b/Mage.Sets/src/mage/sets/zendikar/OranRiefTheVastwood.java
index 2aed5cfeb6..3682229cdd 100644
--- a/Mage.Sets/src/mage/sets/zendikar/OranRiefTheVastwood.java
+++ b/Mage.Sets/src/mage/sets/zendikar/OranRiefTheVastwood.java
@@ -95,6 +95,7 @@ class OranRiefTheVastwoodEffect extends OneShotEffect<OranRiefTheVastwoodEffect>
 		FilterPermanent filter = new FilterPermanent();
 		filter.getCardType().add(CardType.CREATURE);
 		filter.getColor().setGreen(true);
+		filter.setUseColor(true);
 		for (Permanent permanent: game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game)) {
 			if (permanent.getTurnsOnBattlefield() == 0) {
 				permanent.addCounters(new PlusOneCounter());
diff --git a/Mage/src/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java b/Mage/src/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java
index e7ccb0b660..042aa5b1e6 100644
--- a/Mage/src/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java
+++ b/Mage/src/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java
@@ -62,7 +62,9 @@ public class PutLibraryIntoGraveTargetEffect extends OneShotEffect<PutLibraryInt
 	public boolean apply(Game game, Ability source) {
 		Player player = game.getPlayer(source.getFirstTarget());
 		if (player != null) {
-			for (int i = 0; i < amount; i++) {
+			// putting cards to grave shouldn't end the game, so getting minimun available
+			int cardsCount = Math.min(amount, player.getLibrary().size());
+			for (int i = 0; i < cardsCount; i++) {
 				Card card = player.getLibrary().removeFromTop(game);
 				if (card != null)
 					player.getGraveyard().add(card);