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)) {