external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed some possible NPE's in getDefinedPlayers.

Browse Source
This commit is contained in:
Sloth
2012-03-10 07:30:20 +00:00
parent ebc2ce227c
commit c1503594d1
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/forge/card/abilityfactory/AbilityFactory.java
View File

@@ -2004,16 +2004,25 @@ public class AbilityFactory {
} }
} }
} else if (defined.equals("EnchantedController")) { } else if (defined.equals("EnchantedController")) {
if (card.getEnchantingCard() == null) {
return players;
}
final Player p = card.getEnchantingCard().getController(); final Player p = card.getEnchantingCard().getController();
if (!players.contains(p)) { if (!players.contains(p)) {
players.add(p); players.add(p);
} }
} else if (defined.equals("EnchantedOwner")) { } else if (defined.equals("EnchantedOwner")) {
if (card.getEnchantingCard() == null) {
return players;
}
final Player p = card.getEnchantingCard().getOwner(); final Player p = card.getEnchantingCard().getOwner();
if (!players.contains(p)) { if (!players.contains(p)) {
players.add(p); players.add(p);
} }
} else if (defined.equals("EnchantedPlayer")) { } else if (defined.equals("EnchantedPlayer")) {
if (card.getEnchantingCard() == null) {
return players;
}
final Object o = sa.getSourceCard().getEnchanting(); final Object o = sa.getSourceCard().getEnchanting();
if (o instanceof Player) { if (o instanceof Player) {
if (!players.contains(o)) { if (!players.contains(o)) {