From 622a8dcce4398bdf9e79e49dbb75040a8a127652 Mon Sep 17 00:00:00 2001
From: "maurer.it" <maurer.it@gmail>
Date: Tue, 22 Mar 2011 23:09:06 -0400
Subject: [PATCH] Cards with rebound would infinitely rebound.  Fixes this
 issue.

---
 Mage/src/mage/players/PlayerImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Mage/src/mage/players/PlayerImpl.java b/Mage/src/mage/players/PlayerImpl.java
index fc01b3df78..325fdd11ce 100644
--- a/Mage/src/mage/players/PlayerImpl.java
+++ b/Mage/src/mage/players/PlayerImpl.java
@@ -32,7 +32,6 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
@@ -71,7 +70,6 @@ import mage.game.events.DamagedPlayerEvent;
 import mage.game.permanent.Permanent;
 import mage.game.events.GameEvent;
 import mage.game.stack.StackAbility;
-import mage.game.stack.StackObject;
 import mage.target.common.TargetCardInLibrary;
 import mage.target.common.TargetDiscard;
 
@@ -375,8 +373,8 @@ public abstract class PlayerImpl<T extends PlayerImpl<T>> implements Player, Ser
 		if (card != null) {
 			if (!game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.CAST_SPELL, ability.getId(), playerId))) {
 				game.bookmarkState();
+				card.cast(game, game.getZone(card.getId()), ability, playerId);
 				removeFromHand(card, game);
-				card.cast(game, Zone.HAND, ability, playerId);
 				Ability spellAbility = game.getStack().getSpell(ability.getId()).getSpellAbility();
 				if (spellAbility.activate(game, noMana)) {
 					for (KickerAbility kicker: card.getAbilities().getKickerAbilities()) {
@@ -993,10 +991,12 @@ public abstract class PlayerImpl<T extends PlayerImpl<T>> implements Player, Ser
 		}
 	}
 
+	@Override
 	public boolean isTestMode() {
 		return isTestMode;
 	}
 
+	@Override
 	public void setTestMode(boolean value) {
 		this.isTestMode = value;
 	}