github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-13 11:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5132 from NoahGleason/bugfix

Browse source 
Bugfixes
This commit is contained in:
theelk801 2018-07-09 08:53:44 -04:00 committed by GitHub
commit c93bda35ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/cards/c/ChaosWand.java
View file

@ -82,14 +82,16 @@ class ChaosWandEffect extends OneShotEffect {
break;
}
opponent.moveCards(card, Zone.EXILED, source, game);
controller.revealCards(source, new CardsImpl(card), game);
if (card.isInstant() || card.isSorcery()) {
if (!controller.chooseUse(outcome, "Cast " + card.getName() + " without paying its mana cost?", source, game)
|| !controller.cast(card.getSpellAbility(), game, true, new MageObjectReference(source.getSourceObject(game), game))) {
cardsToShuffle.add(card);
}
break;
} else {
cardsToShuffle.add(card);
}
cardsToShuffle.add(card);
}
return opponent.putCardsOnBottomOfLibrary(cardsToShuffle, game, source, false);
}

7
Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java
View file

@ -21,6 +21,7 @@ import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
/**
*
@ -94,9 +95,9 @@ class BelzenlokDemonTokenEffect extends OneShotEffect {
if (otherCreatures > 0) {
new SacrificeControllerEffect(filter, 1, "").apply(game, source);
} else {
Permanent permanent = game.getPermanentOrLKIBattlefield(source.getSourceId());
if (permanent != null) {
permanent.damage(6, permanent.getId(), game, false, true);
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
controller.damage(6, source.getSourceId(), game, false, true);
}
}
return true;