Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Merge branch 'master' of https://github.com/magefree/mage.git

Browse source
This commit is contained in:
LevelX2 2013-07-06 00:44:43 +02:00
commit 9e5f3887bf
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java
View file

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

2
Mage/src/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java
View file

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

2
Mage/src/mage/abilities/effects/common/ReturnSourceFromGraveyardToBattlefieldEffect.java
View file

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