From 6303ebd06a633fc1b5c35d98bd5c628bb6c7c655 Mon Sep 17 00:00:00 2001 From: Sloth Date: Thu, 13 Sep 2012 18:13:56 +0000 Subject: [PATCH] - Fixed a possible NPE in hasProperty in the Player class. --- 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 17f7f2a684f..3345d4e55e1 100644 --- a/src/main/java/forge/game/player/Player.java +++ b/src/main/java/forge/game/player/Player.java @@ -2439,7 +2439,7 @@ public abstract class Player extends GameEntity implements Comparable { return false; } } else if (property.startsWith("Chosen")) { - if (!source.getChosenPlayer().equals(this)) { + if (source.getChosenPlayer() == null || !source.getChosenPlayer().equals(this)) { return false; } }