mirror of
https://github.com/correl/mage.git
synced 2024-11-15 19:19:33 +00:00
Cavern of Souls - fix a bug causes spell can be countered
This commit is contained in:
parent
f6cb13dce0
commit
72f9e0418d
1 changed files with 7 additions and 6 deletions
|
@ -75,7 +75,8 @@ public class CavernOfSouls extends CardImpl<CavernOfSouls> {
|
|||
|
||||
// {tap}: Add one mana of any color to your mana pool. Spend this mana only to cast a creature spell of the chosen type, and that spell can't be countered.
|
||||
this.addAbility(new ConditionalAnyColorManaAbility(1, new CavernOfSoulsManaBuilder()));
|
||||
this.addWatcher(new CavernOfSoulsWatcher());
|
||||
WatcherImpl watcher = new CavernOfSoulsWatcher();
|
||||
this.addWatcher(watcher);
|
||||
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CavernOfSoulsCantCounterEffect()));
|
||||
}
|
||||
|
||||
|
@ -147,7 +148,7 @@ class CavernOfSoulsConditionalMana extends ConditionalMana {
|
|||
}
|
||||
|
||||
class CavernOfSoulsManaCondition extends CreatureCastManaCondition {
|
||||
|
||||
|
||||
@Override
|
||||
public boolean apply(Game game, Ability source, UUID manaProducer) {
|
||||
// check: ... to cast a creature spell
|
||||
|
@ -168,7 +169,7 @@ class CavernOfSoulsManaCondition extends CreatureCastManaCondition {
|
|||
class CavernOfSoulsWatcher extends WatcherImpl<CavernOfSoulsWatcher> {
|
||||
|
||||
public List<UUID> spells = new ArrayList<UUID>();
|
||||
|
||||
|
||||
public CavernOfSoulsWatcher() {
|
||||
super("ManaPaidFromCavernOfSoulsWatcher", WatcherScope.GAME);
|
||||
}
|
||||
|
@ -185,8 +186,8 @@ class CavernOfSoulsWatcher extends WatcherImpl<CavernOfSoulsWatcher> {
|
|||
@Override
|
||||
public void watch(GameEvent event, Game game) {
|
||||
if (event.getType() == GameEvent.EventType.MANA_PAYED) {
|
||||
if (event.getSourceId().equals(this.sourceId)) {
|
||||
spells.add(event.getTargetId());
|
||||
if (game.getObject(event.getSourceId()).getName().equals("Cavern of Souls")) {
|
||||
spells.add(event.getTargetId());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -200,7 +201,7 @@ class CavernOfSoulsWatcher extends WatcherImpl<CavernOfSoulsWatcher> {
|
|||
}
|
||||
|
||||
class CavernOfSoulsCantCounterEffect extends ReplacementEffectImpl<CavernOfSoulsCantCounterEffect> {
|
||||
|
||||
|
||||
public CavernOfSoulsCantCounterEffect() {
|
||||
super(Duration.WhileOnBattlefield, Outcome.Benefit);
|
||||
staticText = null;
|
||||
|
|
Loading…
Reference in a new issue