From 9219d79b2548366f1d60547d763b2bc6e8f60c3b Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 18 Aug 2014 23:54:33 +0200 Subject: [PATCH] Minor changes. --- Mage.Sets/src/mage/sets/newphyrexia/TorporOrb.java | 14 +++++++++----- .../mage/abilities/effects/ContinuousEffects.java | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Mage.Sets/src/mage/sets/newphyrexia/TorporOrb.java b/Mage.Sets/src/mage/sets/newphyrexia/TorporOrb.java index bbd55a49bb6..0bb28ebf893 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/TorporOrb.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/TorporOrb.java @@ -27,18 +27,22 @@ */ package mage.sets.newphyrexia; +import java.util.UUID; import mage.abilities.Ability; import mage.abilities.TriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl; import mage.cards.CardImpl; -import mage.constants.*; +import mage.constants.AbilityType; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.permanent.Permanent; -import java.util.UUID; - /** * * @author BetaSteward @@ -78,7 +82,7 @@ class TorporOrbEffect extends ContinuousRuleModifiyingEffectImpl { public boolean applies(GameEvent event, Ability source, Game game) { if (event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD) { Ability ability = (Ability) getValue("targetAbility"); - if (ability != null && ability instanceof TriggeredAbility) { + if (ability != null && AbilityType.TRIGGERED.equals(ability.getAbilityType())) { Permanent p = game.getPermanent(event.getTargetId()); if (p != null && p.getCardType().contains(CardType.CREATURE)) { return true; @@ -98,4 +102,4 @@ class TorporOrbEffect extends ContinuousRuleModifiyingEffectImpl { return new TorporOrbEffect(this); } -} \ No newline at end of file +} diff --git a/Mage/src/mage/abilities/effects/ContinuousEffects.java b/Mage/src/mage/abilities/effects/ContinuousEffects.java index 7fba3c5f35c..a20ab2b87ab 100644 --- a/Mage/src/mage/abilities/effects/ContinuousEffects.java +++ b/Mage/src/mage/abilities/effects/ContinuousEffects.java @@ -601,7 +601,7 @@ public class ContinuousEffects implements Serializable { * @param event * @param targetAbility ability the event is attached to. can be null. * @param game - * @param checkPlayableMode true if the event does not really happen but it#s checked if the event would be replaced + * @param checkPlayableMode true if the event does not really happen but it's checked if the event would be replaced * @return */ public boolean preventedByRuleModification(GameEvent event, Ability targetAbility, Game game, boolean checkPlayableMode) {