diff --git a/src/forge/ComputerAI_General.java b/src/forge/ComputerAI_General.java
index 5a2e41774c0..3f644a37801 100644
--- a/src/forge/ComputerAI_General.java
+++ b/src/forge/ComputerAI_General.java
@@ -274,7 +274,7 @@ public class ComputerAI_General implements Computer {
         c.setDefendingPlayer(AllZone.Combat.getDefendingPlayer());
         
         //check for planeswalker
-        Card walker = AllZone.GameAction.getPlaneswalker(AllZone.HumanPlayer);
+        Card walker = AllZone.HumanPlayer.getPlaneswalker();
         
         if(walker != null && MyRandom.random.nextBoolean()) {
             c.setPlaneswalker(walker);
diff --git a/src/forge/GameAction.java b/src/forge/GameAction.java
index 01fea02a832..33e0f6e85d6 100644
--- a/src/forge/GameAction.java
+++ b/src/forge/GameAction.java
@@ -24,17 +24,6 @@ public class GameAction {
     
     //private boolean           fantasyQuest     = false;
     
-    //returns null if player does not have a Planeswalker
-    public Card getPlaneswalker(Player player) {
-        PlayerZone p = AllZone.getZone(Constant.Zone.Play, player);
-        CardList c = new CardList(p.getCards());
-        c = c.getType("Planeswalker");
-        
-        if(c.isEmpty()) return null;
-        
-        return c.get(0);
-    }
-
     public void resetActivationsPerTurn(){
     	CardList all = AllZoneUtil.getCardsInGame();
     	
diff --git a/src/forge/Player.java b/src/forge/Player.java
index 4f5203c9eac..6ba980f5dc5 100644
--- a/src/forge/Player.java
+++ b/src/forge/Player.java
@@ -358,6 +358,20 @@ public abstract class Player extends MyObservable{
         doScry(topN, topN.size());
     }
     ///////////////////////////////
+    
+    ///////////////////////////////
+    ////
+    ////	properties about the player and his/her cards/game status
+    ////
+    ///////////////////////////////
+    public boolean hasPlaneswalker() {
+        return null != getPlaneswalker();
+    }
+    
+    public Card getPlaneswalker() {
+    	CardList c = AllZoneUtil.getPlayerTypeInPlay(this, "Planeswalker");
+    	return c.get(0);
+    }
 	
 	////////////////////////////////
 	//