Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

* Path of Ancestry - Fixed possible null pointer exception.

Browse source
This commit is contained in:
LevelX2 2017-09-13 14:52:47 +02:00
parent ab55aa13c9
commit c3157bbcde
2 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Mage.Sets/src/mage/cards/p/PathOfAncestry.java
View file

@ -29,6 +29,7 @@ package mage.cards.p;
import java.util.Iterator;
import java.util.UUID;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.common.EntersBattlefieldTappedAbility;
@ -44,6 +45,7 @@ import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.stack.Spell;
import mage.players.Player;
/**
*
@ -105,19 +107,24 @@ class PathOfAncestryTriggeredAbility extends TriggeredAbilityImpl {
if (event.getData().equals(abilityOriginalId)) {
Spell spell = game.getStack().getSpell(event.getTargetId());
if (spell != null && spell.isCreature()) {
Iterator<SubType> spellSubs = spell.getSubtype(game).iterator();
while (spellSubs.hasNext()) {
SubType sType = spellSubs.next();
if (sType.getSubTypeSet() == SubTypeSet.CreatureType) {
for (UUID cmdr : game.getPlayer(spell.getControllerId()).getCommandersIds()) {
if (game.getObject(cmdr).getSubtype(game).contains(sType)) {
return true;
Player controller = game.getPlayer(getControllerId());
if (controller != null && controller.getCommandersIds() != null && !controller.getCommandersIds().isEmpty()) {
Iterator<SubType> spellSubs = spell.getSubtype(game).iterator();
while (spellSubs.hasNext()) {
SubType sType = spellSubs.next();
if (sType.getSubTypeSet() == SubTypeSet.CreatureType) {
for (UUID cmdr : controller.getCommandersIds()) {
MageObject commander = game.getObject(cmdr);
if (commander != null && commander.getSubtype(game).contains(sType)) {
return true;
}
}
}
}
}
}
}
return false;
}

4
Mage/src/main/java/mage/players/Player.java
View file

@ -650,12 +650,12 @@ public interface Player extends MageItem, Copyable<Player> {
/**
* Set the commanderId of the player
*
* @param commandersIds
* @param commanderId
*/
void addCommanderId(UUID commanderId);
/**
* Get the commanderId of the player
* Get the commanderIds of the player
*
* @return
*/