github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-09 01:01:06 -09:00
Code Issues Projects Releases Packages Wiki Activity

Minor changes.

Browse source
This commit is contained in:
LevelX2 2014-08-18 23:54:33 +02:00
parent b54785688d
commit 9219d79b25
2 changed files with 10 additions and 6 deletions
Mage.Sets/src/mage/sets/newphyrexia
TorporOrb.java
Mage/src/mage/abilities/effects
ContinuousEffects.java

14
Mage.Sets/src/mage/sets/newphyrexia/TorporOrb.java
View file

@ -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);
}
}
}

2
Mage/src/mage/abilities/effects/ContinuousEffects.java
View file

@ -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) {