Merge branch 'master' into tyvar-kell

This commit is contained in:
Oleg Agafonov 2021-01-12 01:45:58 +01:00 committed by GitHub
commit b184fa7842
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 1183 additions and 45 deletions

View file

@ -4,6 +4,7 @@ import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.constants.Zone;
import mage.filter.FilterSpell;
import mage.filter.StaticFilters;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.stack.Spell;
@ -14,8 +15,6 @@ import mage.target.targetpointer.FixedTarget;
*/
public class SpellCastControllerTriggeredAbility extends TriggeredAbilityImpl {
private static final FilterSpell spellCard = new FilterSpell("a spell");
protected FilterSpell filter;
protected String rule;
@ -25,7 +24,7 @@ public class SpellCastControllerTriggeredAbility extends TriggeredAbilityImpl {
protected boolean rememberSourceAsCard = false;
public SpellCastControllerTriggeredAbility(Effect effect, boolean optional) {
this(Zone.BATTLEFIELD, effect, spellCard, optional, false);
this(Zone.BATTLEFIELD, effect, StaticFilters.FILTER_SPELL_A, optional, false);
}
public SpellCastControllerTriggeredAbility(Effect effect, FilterSpell filter, boolean optional) {