From 25efb35467ff8c1c19c12bcb9ca9b76dccb0b46f Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 23:56:08 +0000
Subject: [PATCH] a little more WheneverKeyword cleanup

---
 src/forge/AIPlayer.java                     | 4 ----
 src/forge/HumanPlayer.java                  | 4 ----
 src/forge/Player.java                       | 2 --
 src/forge/card/cardFactory/CardFactory.java | 8 --------
 4 files changed, 18 deletions(-)

diff --git a/src/forge/AIPlayer.java b/src/forge/AIPlayer.java
index 189cb42d685..e8ba6639669 100644
--- a/src/forge/AIPlayer.java
+++ b/src/forge/AIPlayer.java
@@ -33,10 +33,6 @@ public class AIPlayer extends Player{
 		return p1.getName().equals(this.name);
 	}
 	
-	protected Card getPlayerCard() {
-		return AllZone.CardFactory.ComputerNullCard;
-	}
-	
 	///////////////
 	///
 	/// End transition methods
diff --git a/src/forge/HumanPlayer.java b/src/forge/HumanPlayer.java
index a5c699971b0..aaa3eda7dcf 100644
--- a/src/forge/HumanPlayer.java
+++ b/src/forge/HumanPlayer.java
@@ -33,10 +33,6 @@ public class HumanPlayer extends Player{
 		return p1.getName().equals(this.name);
 	}
 	
-	protected Card getPlayerCard() {
-		return AllZone.CardFactory.HumanNullCard;
-	}
-	
 	///////////////
 	///
 	/// End transition methods
diff --git a/src/forge/Player.java b/src/forge/Player.java
index c41ceb1dd27..03c225ab225 100644
--- a/src/forge/Player.java
+++ b/src/forge/Player.java
@@ -154,8 +154,6 @@ public abstract class Player extends MyObservable{
 		return newLifeSet;
 	}
 	
-	protected abstract Card getPlayerCard();
-	
 	public boolean canGainLife() {
 		if(AllZoneUtil.isCardInPlay("Sulfuric Vortex") || AllZoneUtil.isCardInPlay("Leyline of Punishment") || 
 				AllZoneUtil.isCardInPlay("Platinum Emperion", this) || AllZoneUtil.isCardInPlay("Forsaken Wastes")) return false;
diff --git a/src/forge/card/cardFactory/CardFactory.java b/src/forge/card/cardFactory/CardFactory.java
index b7ce099267a..1b7254018fd 100644
--- a/src/forge/card/cardFactory/CardFactory.java
+++ b/src/forge/card/cardFactory/CardFactory.java
@@ -59,9 +59,6 @@ public class CardFactory implements NewConstants {
     
     private HashSet<String>   removedCardList;
     private Card              blankCard = new Card();                 //new code
-    // The Following "Cards" are used by the Whenever Keyword
-    public Card               HumanNullCard = new Card();
-    public Card               ComputerNullCard = new Card();
                                                                        
     public CardFactory(String filename) {
         this(new File(filename));
@@ -88,11 +85,6 @@ public class CardFactory implements NewConstants {
         blankCard.setOwner(AllZone.HumanPlayer);
         blankCard.setController(AllZone.HumanPlayer);
         
-        HumanNullCard.setOwner(AllZone.HumanPlayer);
-        HumanNullCard.setController(AllZone.HumanPlayer);
-        ComputerNullCard.setOwner(AllZone.ComputerPlayer);
-        ComputerNullCard.setController(AllZone.ComputerPlayer);
-        
         removedCardList = new HashSet<String>(FileUtil.readFile(ForgeProps.getFile(REMOVED)));