mirror of
https://github.com/correl/mage.git
synced 2024-12-28 11:14:13 +00:00
- Fixed #8819
This commit is contained in:
parent
ad4b6a8e29
commit
4a15f88a43
1 changed files with 12 additions and 4 deletions
|
@ -17,12 +17,13 @@ import mage.filter.common.FilterArtifactOrEnchantmentCard;
|
||||||
import mage.filter.predicate.mageobject.ManaValuePredicate;
|
import mage.filter.predicate.mageobject.ManaValuePredicate;
|
||||||
import mage.game.Game;
|
import mage.game.Game;
|
||||||
import mage.game.events.GameEvent;
|
import mage.game.events.GameEvent;
|
||||||
import mage.game.events.ZoneChangeEvent;
|
|
||||||
import mage.target.common.TargetCardInYourGraveyard;
|
import mage.target.common.TargetCardInYourGraveyard;
|
||||||
import mage.target.common.TargetControlledPermanent;
|
import mage.target.common.TargetControlledPermanent;
|
||||||
import mage.target.targetadjustment.TargetAdjuster;
|
import mage.target.targetadjustment.TargetAdjuster;
|
||||||
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
import mage.game.events.ZoneChangeEvent;
|
||||||
|
import mage.game.permanent.Permanent;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author TheElk801
|
* @author TheElk801
|
||||||
|
@ -44,8 +45,8 @@ public final class TameshiRealityArchitect extends CardImpl {
|
||||||
// {X}{W}, Return a land you control to its owner's hand: Return target artifact or enchantment card with mana value X or less from your graveyard to the battlefield. Activate only as a sorcery.
|
// {X}{W}, Return a land you control to its owner's hand: Return target artifact or enchantment card with mana value X or less from your graveyard to the battlefield. Activate only as a sorcery.
|
||||||
Ability ability = new ActivateAsSorceryActivatedAbility(
|
Ability ability = new ActivateAsSorceryActivatedAbility(
|
||||||
new ReturnFromGraveyardToBattlefieldTargetEffect()
|
new ReturnFromGraveyardToBattlefieldTargetEffect()
|
||||||
.setText("return target artifact or enchantment card with " +
|
.setText("return target artifact or enchantment card with "
|
||||||
"mana value X or less from your graveyard to the battlefield"),
|
+ "mana value X or less from your graveyard to the battlefield"),
|
||||||
new ManaCostsImpl<>("{X}{W}")
|
new ManaCostsImpl<>("{X}{W}")
|
||||||
);
|
);
|
||||||
ability.addCost(new ReturnToHandChosenControlledPermanentCost(
|
ability.addCost(new ReturnToHandChosenControlledPermanentCost(
|
||||||
|
@ -98,6 +99,13 @@ class TameshiRealityArchitectTriggeredAbility extends ZoneChangeTriggeredAbility
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean checkTrigger(GameEvent event, Game game) {
|
public boolean checkTrigger(GameEvent event, Game game) {
|
||||||
return super.checkTrigger(event, game) && !((ZoneChangeEvent) event).getTarget().isCreature(game);
|
ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
|
||||||
|
Permanent permanentMovedToHand = game.getPermanentOrLKIBattlefield(zEvent.getTargetId());
|
||||||
|
if (permanentMovedToHand != null
|
||||||
|
&& fromZone == zEvent.getFromZone()
|
||||||
|
&& toZone == zEvent.getToZone()) {
|
||||||
|
return !permanentMovedToHand.isCreature(game);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue