From aa63a262b6746a92988da38fe196cb75446ec644 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Thu, 13 Sep 2018 08:21:12 -0400 Subject: [PATCH] added isInstantOrSorcery method to MageObject --- Mage.Sets/src/mage/cards/e/ErraticCyclops.java | 2 +- Mage/src/main/java/mage/MageObject.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Mage.Sets/src/mage/cards/e/ErraticCyclops.java b/Mage.Sets/src/mage/cards/e/ErraticCyclops.java index 18816aa9cd0..ab18fc9a074 100644 --- a/Mage.Sets/src/mage/cards/e/ErraticCyclops.java +++ b/Mage.Sets/src/mage/cards/e/ErraticCyclops.java @@ -65,7 +65,7 @@ class ErraticCyclopsTriggeredAbility extends TriggeredAbilityImpl { public boolean checkTrigger(GameEvent event, Game game) { Spell spell = game.getStack().getSpell(event.getTargetId()); if (spell != null && spell.isControlledBy(controllerId) - && (spell.isInstant() || spell.isSorcery())) { + && spell.isInstantOrSorcery()) { this.getEffects().clear(); this.addEffect(new BoostSourceEffect( spell.getConvertedManaCost(), 0, Duration.EndOfTurn diff --git a/Mage/src/main/java/mage/MageObject.java b/Mage/src/main/java/mage/MageObject.java index 1ce4f4b56d2..b65f1721739 100644 --- a/Mage/src/main/java/mage/MageObject.java +++ b/Mage/src/main/java/mage/MageObject.java @@ -86,10 +86,10 @@ public interface MageObject extends MageItem, Serializable { void setZoneChangeCounter(int value, Game game); - default boolean isHistoric(){ + default boolean isHistoric() { return getCardType().contains(CardType.ARTIFACT) || getSuperType().contains(SuperType.LEGENDARY) - || hasSubtype(SubType.SAGA, null ); + || hasSubtype(SubType.SAGA, null); } default boolean isCreature() { @@ -116,6 +116,10 @@ public interface MageObject extends MageItem, Serializable { return getCardType().contains(CardType.SORCERY); } + default boolean isInstantOrSorcery() { + return this.isInstant() || this.isSorcery(); + } + default boolean isPlaneswalker() { return getCardType().contains(CardType.PLANESWALKER); }