From 3ae5b4cd80f101ba27cc0faa9811a02bea842419 Mon Sep 17 00:00:00 2001
From: dripton <dripton@cardforge.org>
Date: Thu, 5 Sep 2013 23:07:53 +0000
Subject: [PATCH] Add null check to avoid NPE

Fixes bug 735
---
 src/main/java/forge/game/player/Player.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java
index d1212308ec3..c46735fbe4d 100644
--- a/src/main/java/forge/game/player/Player.java
+++ b/src/main/java/forge/game/player/Player.java
@@ -355,7 +355,7 @@ public class Player extends GameEntity implements Comparable<Player> {
     }
 
     public boolean isOpponentOf(Player other) {
-        return other != this && ( other.teamNumber < 0 || other.teamNumber != this.teamNumber );
+        return other != this && other != null && ( other.teamNumber < 0 || other.teamNumber != this.teamNumber );
     }