From 74edb0f0efec4e93bc33d9896bedd55d3f369a60 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 24 Sep 2014 12:40:49 +0200 Subject: [PATCH] Fixed possible NPE problems. --- Mage/src/mage/abilities/costs/common/PayLoyaltyCost.java | 2 +- .../mage/abilities/costs/common/RemoveCountersSourceCost.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Mage/src/mage/abilities/costs/common/PayLoyaltyCost.java b/Mage/src/mage/abilities/costs/common/PayLoyaltyCost.java index 6248f161c39..16c0c4d959a 100644 --- a/Mage/src/mage/abilities/costs/common/PayLoyaltyCost.java +++ b/Mage/src/mage/abilities/costs/common/PayLoyaltyCost.java @@ -60,7 +60,7 @@ public class PayLoyaltyCost extends CostImpl { @Override public boolean canPay(Ability ability, UUID sourceId, UUID controllerId, Game game) { Permanent planeswalker = game.getPermanent(sourceId); - return planeswalker.getCounters().getCount(CounterType.LOYALTY) + amount >= 0 && planeswalker.canLoyaltyBeUsed(game); + return planeswalker != null && planeswalker.getCounters().getCount(CounterType.LOYALTY) + amount >= 0 && planeswalker.canLoyaltyBeUsed(game); } @Override diff --git a/Mage/src/mage/abilities/costs/common/RemoveCountersSourceCost.java b/Mage/src/mage/abilities/costs/common/RemoveCountersSourceCost.java index 40272624815..4e035be6259 100644 --- a/Mage/src/mage/abilities/costs/common/RemoveCountersSourceCost.java +++ b/Mage/src/mage/abilities/costs/common/RemoveCountersSourceCost.java @@ -63,7 +63,7 @@ public class RemoveCountersSourceCost extends CostImpl { @Override public boolean canPay(Ability ability, UUID sourceId, UUID controllerId, Game game) { Permanent permanent = game.getPermanent(sourceId); - if (permanent.getCounters().getCount(name) >= amount) { + if (permanent != null && permanent.getCounters().getCount(name) >= amount) { return true; } return false;