From 9fc6ca70270637db7e413125e4d51f24b7c0f4cc Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 03:22:58 +0000
Subject: [PATCH] - Fixed Pongify and Crib Swap. - Got rid of the "Opponent
 has:{creature}" console output (should improve performance slightly). - Fixed
 Avenger of Zendikar.

---
 src/forge/CardFactory.java           | 4 ++--
 src/forge/CardFactory_Creatures.java | 1 -
 src/forge/GameAction.java            | 2 +-
 src/forge/GameActionUtil.java        | 7 ++-----
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index c0989ee9963..de8708c8653 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -4681,7 +4681,7 @@ public class CardFactory implements NewConstants {
         {
           if(AllZone.GameAction.isCardInPlay(getTargetCard()) && CardFactoryUtil.canTarget(card,getTargetCard()) )
           {
-            CardFactoryUtil.makeToken("Ape", "G 3 3 Ape", AllZone.GameAction.getOpponent(card.getController()), "G", 
+            CardFactoryUtil.makeToken("Ape", "G 3 3 Ape", AllZone.GameAction.getOpponent(getTargetCard().getController()), "G", 
             						  new String[] {"Creature", "Ape"}, 3, 3, new String[] {""} );
             AllZone.GameAction.destroyNoRegeneration(getTargetCard());
           }
@@ -6045,7 +6045,7 @@ public class CardFactory implements NewConstants {
         {
           if(AllZone.GameAction.isCardInPlay(getTargetCard())  && CardFactoryUtil.canTarget(card, getTargetCard()) )
           {
-            CardFactoryUtil.makeToken("Shapeshifter", "C 1 1 Shapeshifter", AllZone.GameAction.getOpponent(card.getController()), "", 
+            CardFactoryUtil.makeToken("Shapeshifter", "C 1 1 Shapeshifter", AllZone.GameAction.getOpponent(getTargetCard().getController()), "", 
             						  new String[] {"Creature", "Shapeshifter"}, 1, 1, new String[] {"Changeling"} );
             //remove card from play
             AllZone.GameAction.removeFromGame(getTargetCard());
diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java
index 1615625b58d..19a11d5b063 100644
--- a/src/forge/CardFactory_Creatures.java
+++ b/src/forge/CardFactory_Creatures.java
@@ -18691,7 +18691,6 @@ public class CardFactory_Creatures {
 	        			AllZone.Stack.add(ability);
 	        		}
 	        	};
-	        	card.clearSpellKeepManaAbility();
 	        	card.addComesIntoPlayCommand(comesIntoPlay);
 	        }//*************** END ************ END **************************
 	      
diff --git a/src/forge/GameAction.java b/src/forge/GameAction.java
index 2de3f43802a..6596cf105fd 100644
--- a/src/forge/GameAction.java
+++ b/src/forge/GameAction.java
@@ -22,7 +22,7 @@ public class GameAction
   }
 
   @SuppressWarnings("unused") // getCurrentCard
-private Card getCurrentCard(int ID)
+  private Card getCurrentCard(int ID)
   {
     CardList all = new CardList();
     all.addAll(AllZone.Human_Graveyard.getCards());
diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java
index 444e8c9d2ff..5be9e27bc8b 100644
--- a/src/forge/GameActionUtil.java
+++ b/src/forge/GameActionUtil.java
@@ -6349,20 +6349,17 @@ public class GameActionUtil
 		PlayerZone opponentZone = AllZone.getZone(Constant.Zone.Play, opponent);
 		CardList opponentList = new CardList(opponentZone.getCards());
 		opponentList = opponentList.getType("Creature");
-		//System.out.println("opponent has " + opponentList.size() + " creatures");
 		
+		/*
 		for (int i = 0; i < opponentList.size(); i++)
 		{
 			Card tmpCard = opponentList.get(i);
 			System.out.println("opponent has: " + tmpCard);
 		}
+		*/
 		
 		if (3 > opponentList.size())
-		{
-			// they do not have 3 or more creatures in play, so Defense of the
-			// Heart would not be able to be sacrificed.
 			return;
-		}
 
 		// opponent has more than 3 creatures in play, so check if Defense of
 		// the Heart is in play and sacrifice it for the effect.