diff --git a/Mage.Sets/src/mage/cards/h/HalvarGodOfBattle.java b/Mage.Sets/src/mage/cards/h/HalvarGodOfBattle.java index bc2c801e63c..c02133ae506 100644 --- a/Mage.Sets/src/mage/cards/h/HalvarGodOfBattle.java +++ b/Mage.Sets/src/mage/cards/h/HalvarGodOfBattle.java @@ -189,7 +189,8 @@ class HalvarGodOfBattlePredicate implements ObjectSourcePlayerPredicate input, Game game) { UUID attachedTo = input.getObject().getAttachedTo(); - return attachedTo != null && filter.match(game.getPermanent(attachedTo), input.getSourceId(), input.getPlayerId(), game); + Permanent permanent = game.getPermanent(attachedTo); + return permanent != null && filter.match(permanent, input.getSourceId(), input.getPlayerId(), game); } @Override diff --git a/Mage.Sets/src/mage/cards/p/PathOfMettle.java b/Mage.Sets/src/mage/cards/p/PathOfMettle.java index 21ebb110bba..78af4037d56 100644 --- a/Mage.Sets/src/mage/cards/p/PathOfMettle.java +++ b/Mage.Sets/src/mage/cards/p/PathOfMettle.java @@ -22,6 +22,7 @@ import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; import mage.game.Game; import mage.game.events.GameEvent; +import mage.game.permanent.Permanent; /** * @author LevelX2 @@ -101,8 +102,9 @@ class PathOfMettleTriggeredAbility extends TriggeredAbilityImpl { int attackerCount = 0; if (game.getCombat() != null) { if (isControlledBy(game.getCombat().getAttackingPlayerId())) { - for (UUID attacker : game.getCombat().getAttackers()) { - if (filter.match(game.getPermanent(attacker), game)) { + for (UUID attackerId : game.getCombat().getAttackers()) { + Permanent attacker = game.getPermanent(attackerId); + if (attacker != null && filter.match(attacker, game)) { attackerCount++; } } diff --git a/Mage/src/main/java/mage/abilities/common/AttacksWithCreaturesTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AttacksWithCreaturesTriggeredAbility.java index 7fe85f37cd9..b2cb416351f 100644 --- a/Mage/src/main/java/mage/abilities/common/AttacksWithCreaturesTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/AttacksWithCreaturesTriggeredAbility.java @@ -55,8 +55,8 @@ public class AttacksWithCreaturesTriggeredAbility extends TriggeredAbilityImpl { if (game.getCombat().getAttackingPlayerId().equals(getControllerId())) { int attackerCount = 0; for (UUID attackerId : game.getCombat().getAttackers()) { - Permanent permanent = game.getPermanent(attackerId); - if (permanent != null && filter.match(game.getPermanent(attackerId), game)) { + Permanent attacker = game.getPermanent(attackerId); + if (attacker != null && filter.match(attacker, game)) { attackerCount++; } } diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/AttachedToPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/AttachedToPredicate.java index 9f287b3a930..fbe85af96a8 100644 --- a/Mage/src/main/java/mage/filter/predicate/permanent/AttachedToPredicate.java +++ b/Mage/src/main/java/mage/filter/predicate/permanent/AttachedToPredicate.java @@ -22,7 +22,8 @@ public class AttachedToPredicate implements Predicate { @Override public boolean apply(Permanent input, Game game) { UUID attachedTo = input.getAttachedTo(); - return attachedTo != null && filter.match(game.getPermanent(attachedTo), game); + Permanent permanent = game.getPermanent(attachedTo); + return permanent != null && filter.match(permanent, game); } @Override