From c1503594d1e14959e486c636d028e37f8258764c Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Sat, 10 Mar 2012 07:30:20 +0000
Subject: [PATCH] - Fixed some possible NPE's in getDefinedPlayers.

---
 .../java/forge/card/abilityfactory/AbilityFactory.java   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactory.java b/src/main/java/forge/card/abilityfactory/AbilityFactory.java
index 035b430884c..462e059fa19 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactory.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactory.java
@@ -2004,16 +2004,25 @@ public class AbilityFactory {
                 }
             }
         } else if (defined.equals("EnchantedController")) {
+            if (card.getEnchantingCard() == null) {
+                return players;
+            }
             final Player p = card.getEnchantingCard().getController();
             if (!players.contains(p)) {
                 players.add(p);
             }
         } else if (defined.equals("EnchantedOwner")) {
+            if (card.getEnchantingCard() == null) {
+                return players;
+            }
             final Player p = card.getEnchantingCard().getOwner();
             if (!players.contains(p)) {
                 players.add(p);
             }
         } else if (defined.equals("EnchantedPlayer")) {
+            if (card.getEnchantingCard() == null) {
+                return players;
+            }
             final Object o = sa.getSourceCard().getEnchanting();
             if (o instanceof Player) {
                 if (!players.contains(o)) {