From 3bbc63d6c4b87505d540a76fd2ef549adfd6f195 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Thu, 22 Sep 2011 18:15:58 +0400
Subject: [PATCH] Fixed Watchwolf. Fixed RiseFromTheGrave.

---
 Mage.Sets/src/mage/sets/magic2010/RiseFromTheGrave.java | 6 ++++--
 Mage.Sets/src/mage/sets/ravnika/Watchwolf.java          | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/magic2010/RiseFromTheGrave.java b/Mage.Sets/src/mage/sets/magic2010/RiseFromTheGrave.java
index 8f3a52e4de7..5523f82c5a7 100644
--- a/Mage.Sets/src/mage/sets/magic2010/RiseFromTheGrave.java
+++ b/Mage.Sets/src/mage/sets/magic2010/RiseFromTheGrave.java
@@ -74,7 +74,7 @@ public class RiseFromTheGrave extends CardImpl<RiseFromTheGrave> {
 class RiseFromTheGraveEffect extends ContinuousEffectImpl<RiseFromTheGraveEffect> {
 
 	public RiseFromTheGraveEffect() {
-		super(Duration.WhileOnBattlefield, Outcome.Neutral);
+		super(Duration.Custom, Outcome.Neutral);
 		staticText = "That creature is a black Zombie in addition to its other colors and types";
 	}
 
@@ -104,7 +104,9 @@ class RiseFromTheGraveEffect extends ContinuousEffectImpl<RiseFromTheGraveEffect
 					break;
 			}
 			return true;
-		}
+		} else {
+            this.used = true;
+        }
 		return false;
 	}
 
diff --git a/Mage.Sets/src/mage/sets/ravnika/Watchwolf.java b/Mage.Sets/src/mage/sets/ravnika/Watchwolf.java
index 5e7066f6179..513bbe6b56c 100644
--- a/Mage.Sets/src/mage/sets/ravnika/Watchwolf.java
+++ b/Mage.Sets/src/mage/sets/ravnika/Watchwolf.java
@@ -36,14 +36,14 @@ import mage.cards.CardImpl;
 
 /**
  *
- * @author Loki
+ * @author Loki, nantuko
  */
 public class Watchwolf extends CardImpl<Watchwolf> {
 
     public Watchwolf (UUID ownerId) {
         super(ownerId, 239, "Watchwolf", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{G}{W}");
         this.expansionSetCode = "RAV";
-        this.subtype.add("");
+        this.subtype.add("Wolf");
         this.color.setGreen(true);
         this.color.setWhite(true);
         this.power = new MageInt(3);