From d7f6084e4da8122ed9f79b085c496240021814c3 Mon Sep 17 00:00:00 2001 From: Plopman Date: Fri, 5 Jul 2013 18:47:42 +0200 Subject: [PATCH 1/2] Fixed Return from graveyard --- .../common/ReturnFromGraveyardToBattlefieldTargetEffect.java | 2 +- .../common/ReturnSourceFromGraveyardToBattlefieldEffect.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Mage/src/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java b/Mage/src/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java index f911b854a22..5d15a1e98e4 100644 --- a/Mage/src/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java @@ -75,7 +75,7 @@ public class ReturnFromGraveyardToBattlefieldTargetEffect extends OneShotEffect< if (card != null) { Player player = game.getPlayer(card.getOwnerId()); if (player != null) { - if(card.putOntoBattlefield(game, Zone.GRAVEYARD, source.getSourceId(), source.getControllerId(), true)){ + if(card.putOntoBattlefield(game, Zone.GRAVEYARD, source.getSourceId(), source.getControllerId(), tapped)){ return true; } } diff --git a/Mage/src/mage/abilities/effects/common/ReturnSourceFromGraveyardToBattlefieldEffect.java b/Mage/src/mage/abilities/effects/common/ReturnSourceFromGraveyardToBattlefieldEffect.java index 3df272b6a7d..cd6ed5e54b8 100644 --- a/Mage/src/mage/abilities/effects/common/ReturnSourceFromGraveyardToBattlefieldEffect.java +++ b/Mage/src/mage/abilities/effects/common/ReturnSourceFromGraveyardToBattlefieldEffect.java @@ -70,7 +70,7 @@ public class ReturnSourceFromGraveyardToBattlefieldEffect extends OneShotEffect< Player player = game.getPlayer(source.getControllerId()); Card card = player.getGraveyard().get(source.getSourceId(), game); if (card != null) { - if(card.putOntoBattlefield(game, Zone.GRAVEYARD, source.getId(), source.getControllerId(), true)) + if(card.putOntoBattlefield(game, Zone.GRAVEYARD, source.getId(), source.getControllerId(), tapped)) { return true; } From e3ab68bb37ecfc867821f3973ea0b268776dc7fa Mon Sep 17 00:00:00 2001 From: Plopman Date: Fri, 5 Jul 2013 18:48:40 +0200 Subject: [PATCH 2/2] Added M14 in ConstructedFormats --- .../main/java/mage/client/util/sets/ConstructedFormats.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java b/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java index c4a90b407c5..4b7f279187c 100644 --- a/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java +++ b/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java @@ -17,6 +17,7 @@ public class ConstructedFormats { private static final String[] constructedFormats = { "- All Sets", "- Standard", "- Extended", "- Modern", + "Magic 2014", "Modern Masters", "* Return to Ravnica Block", "Dragon's Maze", "Gatecrash", "Return to Ravnica", "Magic 2013", "Planechase 2012", @@ -346,6 +347,9 @@ public class ConstructedFormats { if (format.equals("Magic 2013")) { return Arrays.asList("M13"); } + if (format.equals("Magic 2014")) { + return Arrays.asList("M14"); + } if (format.equals("Planechase")) { return Arrays.asList("HOP"); }