From 8451aa99a4763def92af94e4fe73777db730dda0 Mon Sep 17 00:00:00 2001
From: Sol <zenchristo@gmail.com>
Date: Mon, 22 Aug 2011 03:38:48 +0000
Subject: [PATCH] - Fixing NPE in IsPlayer()

---
 src/main/java/forge/AIPlayer.java    | 5 -----
 src/main/java/forge/HumanPlayer.java | 2 +-
 src/main/java/forge/Player.java      | 4 +++-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/main/java/forge/AIPlayer.java b/src/main/java/forge/AIPlayer.java
index d4f34f8ea89..b6b1598e2b3 100644
--- a/src/main/java/forge/AIPlayer.java
+++ b/src/main/java/forge/AIPlayer.java
@@ -67,11 +67,6 @@ public class AIPlayer extends Player {
         return true;
     }
 
-    /** {@inheritDoc} */
-    public boolean isPlayer(Player p1) {
-        return p1.getName().equals(this.name);
-    }
-
     ///////////////
     ///
     /// End transition methods
diff --git a/src/main/java/forge/HumanPlayer.java b/src/main/java/forge/HumanPlayer.java
index 3335b87543c..2d4c5f5359b 100644
--- a/src/main/java/forge/HumanPlayer.java
+++ b/src/main/java/forge/HumanPlayer.java
@@ -68,7 +68,7 @@ public class HumanPlayer extends Player {
 
     /** {@inheritDoc} */
     public boolean isPlayer(Player p1) {
-        return p1.getName().equals(this.name);
+        return p1 != null && p1.getName().equals(this.name);
     }
 
     ///////////////
diff --git a/src/main/java/forge/Player.java b/src/main/java/forge/Player.java
index b134810a0fd..508e6d97481 100644
--- a/src/main/java/forge/Player.java
+++ b/src/main/java/forge/Player.java
@@ -127,7 +127,9 @@ public abstract class Player extends MyObservable {
      * @param p1 a {@link forge.Player} object.
      * @return a boolean.
      */
-    public abstract boolean isPlayer(Player p1);
+    public boolean isPlayer(Player p1) {
+        return p1 != null && p1.getName().equals(this.name);
+    }
 
     /**
      * <p>getOpponent.</p>