From 1f6f5ea47f3441befa1fe7c13fc8c2dff67dd139 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sun, 7 Aug 2011 00:35:54 +0000
Subject: [PATCH] - Fixing Multikicker.

---
 src/forge/MagicStack.java                   |  2 +-
 src/forge/card/cardFactory/CardFactory.java | 45 +--------------------
 2 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/src/forge/MagicStack.java b/src/forge/MagicStack.java
index f44c113bdeb..951ea056a1b 100644
--- a/src/forge/MagicStack.java
+++ b/src/forge/MagicStack.java
@@ -242,7 +242,7 @@ public class MagicStack extends MyObservable {
 				push(sp);
 			}
 
-			else if (sp.getPayCosts() != null && ! sp.isReplicate()){
+			else if (sp.getPayCosts() != null && !sp.isMultiKicker() && !sp.isReplicate()){
 				push(sp);
 			}
 
diff --git a/src/forge/card/cardFactory/CardFactory.java b/src/forge/card/cardFactory/CardFactory.java
index f307f227fa2..66ef53e092b 100644
--- a/src/forge/card/cardFactory/CardFactory.java
+++ b/src/forge/card/cardFactory/CardFactory.java
@@ -482,12 +482,7 @@ public class CardFactory implements NewConstants {
                     
             	public void execute() {
                     CardList CardsinPlay = AllZoneUtil.getTypeInPlay("World");
-              		CardsinPlay = CardsinPlay.filter(new CardListFilter() {
-        				public boolean addCard(Card c) {
-        					if(!c.equals(card)) return true;
-        					return false;
-        				}
-        	      	});
+              		CardsinPlay.remove(card);
               		for(int i = 0; i < CardsinPlay.size(); i++)
                         AllZone.GameAction.sacrificeDestroy(CardsinPlay.get(i));	 
                     }//execute()
@@ -508,45 +503,7 @@ public class CardFactory implements NewConstants {
         		sa.setMultiKickerManaCost(k[1]);
         	}
         }
-        
-        /*
-        if (hasKeyword(card, "etbLoseLife") != -1) {
-        	int n = hasKeyword(card, "etbLoseLife");
 
-        	String parse = card.getKeyword().get(n).toString();
-        	card.removeIntrinsicKeyword(parse);
-        	
-        	String k[] = parse.split(":");
-
-        	final int num = Integer.parseInt(k[1]);
-        	card.getSpellPermanent().setLoseLifeAmount(num);
-
-        	// performs the gain
-        	final SpellAbility etbLoseLifeAbility = new Ability(card, "0") {
-        		@Override
-        		public void resolve() {
-        			card.getController().loseLife(num, card);
-        		}
-        	};
-
-        	// when the card enters the battlefield
-        	Command etbLoseLife = new Command() {
-				private static final long serialVersionUID = -6797619430597211329L;
-
-				public void execute() {
-        			StringBuilder sb = new StringBuilder();
-        			sb.append(card.getController()).append(" loses "+num+" life");
-        			etbLoseLifeAbility.setStackDescription(sb.toString());
-
-                    AllZone.Stack.addSimultaneousStackEntry(etbLoseLifeAbility);
-
-        		}
-        	};
-        	card.addComesIntoPlayCommand(etbLoseLife);
-        } // etbLoseLife
-        */
-        
-        
         if(hasKeyword(card, "SearchRebel") != -1) {
             int n = hasKeyword(card, "SearchRebel");
             if(n != -1) {