From eabf3f522a868271ece3d55c05f68d83c2257573 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 20:44:40 +0000
Subject: [PATCH] move code for Nissa's Chosen from sacrificeDestroy to
 moveToGraveyard

---
 src/forge/GameAction.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/forge/GameAction.java b/src/forge/GameAction.java
index 1c581e96c0d..db992da6794 100644
--- a/src/forge/GameAction.java
+++ b/src/forge/GameAction.java
@@ -151,13 +151,17 @@ public class GameAction {
     }
     
     public Card moveToGraveyard(Card c) {
-    	
+    	final PlayerZone origZone = AllZone.getZone(c);
     	final PlayerZone grave = AllZone.getZone(Constant.Zone.Graveyard, c.getOwner());
 
     	if (AllZoneUtil.isCardInPlay("Leyline of the Void", c.getOwner().getOpponent())) {
     		return moveTo(AllZone.getZone(Constant.Zone.Exile, c.getOwner()), c);
     	}
     	
+    	if(c.getName().equals("Nissa's Chosen") && origZone.is(Constant.Zone.Battlefield)) {
+            return moveToLibrary(c);
+        }
+    	
     	if(c.hasKeyword("If CARDNAME would be put into a graveyard this turn, exile it instead.")) {
     		return moveTo(AllZone.getZone(Constant.Zone.Exile, c.getOwner()), c);
     	}
@@ -2082,11 +2086,6 @@ public class GameAction {
         	persistAb.setStackDescription(newCard.getName() + " - Returning from Persist");
         	AllZone.Stack.add(persistAb);
         }
-        
-        if(c.getName().equals("Nissa's Chosen")) {
-            PlayerZone library = AllZone.getZone(Constant.Zone.Library, newCard.getOwner());
-            moveTo(library, newCard);
-        }
     }//sacrificeDestroy()
     
     public boolean destroy(Card c) {