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

- Fixed Indomitable Creativity. Bug #3029

Browse source
This commit is contained in:
Jeff 2017-03-27 16:42:32 -05:00
parent 3a2c828fb8
commit c4dc0222d8
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Mage.Sets/src/mage/cards/i/IndomitableCreativity.java
View file

@ -143,12 +143,12 @@ class IndomitableCreativityEffect extends OneShotEffect {
cards.add(card);
}
if (card.isCreature() || card.isArtifact()) {
controllerOfDestroyedCreature.moveCards(card, Zone.BATTLEFIELD, source, game);
}
if (!cards.isEmpty()) {
revealCards.addAll(cards);
if (card.isCreature() || card.isArtifact()) {
controllerOfDestroyedCreature.moveCards(card, Zone.EXILED, source, game);
controllerOfDestroyedCreature.moveCards(card, Zone.BATTLEFIELD, source, game);
}
Set<Card> cardsToShuffle = cards.getCards(game);
cardsToShuffle.remove(card);
library.addAll(cardsToShuffle, game);

2
Mage/src/main/java/mage/target/common/TargetCreaturePermanentSameController.java
View file

@ -56,7 +56,7 @@ public class TargetCreaturePermanentSameController extends TargetCreaturePermane
UUID targetId = (UUID) object;
Permanent targetPermanent = game.getPermanent(targetId);
if (targetPermanent != null) {
if (firstTargetPermanent.getId() != targetPermanent.getId()) {
if (!firstTargetPermanent.getId().equals(targetPermanent.getId())) {
if (!firstTargetPermanent.getControllerId().equals(targetPermanent.getOwnerId())) {
return false;
}

2
Mage/src/main/java/mage/target/common/TargetCreaturePermanentWithDifferentTypes.java
View file

@ -61,7 +61,7 @@ public class TargetCreaturePermanentWithDifferentTypes extends TargetCreaturePer
for (Object object : getTargets()) {
UUID targetId = (UUID) object;
Permanent selectedCreature = game.getPermanent(targetId);
if (creature.getId() != selectedCreature.getId()) {
if (!creature.getId().equals(selectedCreature.getId())) {
if (CardUtil.shareSubtypes(creature, selectedCreature, game)) {
return false;
}