github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 11:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated Chaos Warp

Browse source
This commit is contained in:
MitchelStein 2014-08-17 05:30:31 -07:00
parent dc943fd851
commit 9533a513be
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Mage.Sets/src/mage/sets/vintagemasters/ChaosWarp.java
View file

@ -44,6 +44,9 @@ import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.target.Target; import mage.target.Target;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import mage.filter.FilterPermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.CardTypePredicate;
/** /**
* *
@ -97,7 +100,7 @@ class ChaosWarpShuffleIntoLibraryEffect extends OneShotEffect {
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source)); Permanent permanent = game.getPermanent(targetPointer.getFirst(game, source));
if (permanent != null) { if (permanent != null) {
if (permanent.moveToZone(Zone.LIBRARY, source.getSourceId(), game, true) ) { if (game.getPlayer(permanent.getOwnerId()).moveCardToLibrary(permanent)) {
game.getPlayer(permanent.getOwnerId()).shuffleLibrary(game); game.getPlayer(permanent.getOwnerId()).shuffleLibrary(game);
return true; return true;
} }
@ -136,9 +139,7 @@ public ChaosWarpRevealEffect() {
player.revealCards("Chaos Warp", cards, game); player.revealCards("Chaos Warp", cards, game);
if (card != null) { if (card != null) {
if ((cardType.contains(CardType.ARTIFACT) || cardType.contains(CardType.CREATURE) if (card.FilterPermanentCard.match()) {
|| cardType.contains(CardType.ENCHANTMENT) || cardType.contains(CardType.LAND)
|| cardType.contains(CardType.PLANESWALKER)))) {
card = player.getLibrary().removeFromTop(game); card = player.getLibrary().removeFromTop(game);
card.putOntoBattlefield(game, Zone.HAND, source.getSourceId(), source.getControllerId()); card.putOntoBattlefield(game, Zone.HAND, source.getSourceId(), source.getControllerId());
} }