diff --git a/Mage.Sets/src/mage/cards/a/ArclightPhoenix.java b/Mage.Sets/src/mage/cards/a/ArclightPhoenix.java index 224a03af960..5b341d251d1 100644 --- a/Mage.Sets/src/mage/cards/a/ArclightPhoenix.java +++ b/Mage.Sets/src/mage/cards/a/ArclightPhoenix.java @@ -72,7 +72,7 @@ enum ArclightPhoenixCondition implements Condition { = (ArclightPhoenixWatcher) game.getState().getWatchers().get( ArclightPhoenixWatcher.class.getSimpleName() ); - return watcher.getInstantSorceryCount(source.getControllerId()) > 2; + return watcher != null && watcher.getInstantSorceryCount(source.getControllerId()) > 2; } } @@ -108,6 +108,12 @@ class ArclightPhoenixWatcher extends Watcher { } } + @Override + public void reset() { + super.reset(); + this.instantSorceryCount.clear(); + } + public int getInstantSorceryCount(UUID playerId) { return this.instantSorceryCount.getOrDefault(playerId, 0); }