diff --git a/Mage/src/main/java/mage/players/ManaPoolItem.java b/Mage/src/main/java/mage/players/ManaPoolItem.java index 5b18b4d53a0..864b8764844 100644 --- a/Mage/src/main/java/mage/players/ManaPoolItem.java +++ b/Mage/src/main/java/mage/players/ManaPoolItem.java @@ -22,7 +22,7 @@ public class ManaPoolItem implements Serializable, Emptiable { private int black = 0; private int colorless = 0; private ConditionalMana conditionalMana; - private MageObject sourceObject; + private MageObject sourceObject; // source of the mana, can be null (what's use case for null values? JayDi85) private UUID originalId; // originalId of the mana producing ability private boolean flag = false; private Duration duration; diff --git a/Mage/src/main/java/mage/watchers/common/ManaPaidSourceWatcher.java b/Mage/src/main/java/mage/watchers/common/ManaPaidSourceWatcher.java index fc1fb57b282..88de5afe679 100644 --- a/Mage/src/main/java/mage/watchers/common/ManaPaidSourceWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/ManaPaidSourceWatcher.java @@ -59,10 +59,10 @@ public class ManaPaidSourceWatcher extends Watcher { private void increment(MageObject sourceObject, ManaType manaType, Game game) { total++; - if (sourceObject.hasSubtype(SubType.TREASURE, game)) { + if (sourceObject != null && sourceObject.hasSubtype(SubType.TREASURE, game)) { treasure++; } - if (!sourceObject.isSnow()) { + if (sourceObject != null && !sourceObject.isSnow()) { return; } switch (manaType) {