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

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2017-09-01 16:04:14 +02:00
commit 5882612293
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Mage.Sets/src/mage/cards/m/MoltenPsyche.java
View file

@ -52,7 +52,7 @@ import mage.watchers.Watcher;
public class MoltenPsyche extends CardImpl { public class MoltenPsyche extends CardImpl {
public MoltenPsyche(UUID ownerId, CardSetInfo setInfo) { public MoltenPsyche(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{R}{R}"); super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{R}{R}");
// Each player shuffles the cards from his or her hand into his or her library, then draws that many cards. // Each player shuffles the cards from his or her hand into his or her library, then draws that many cards.
// Metalcraft - If you control three or more artifacts, Molten Psyche deals damage to each opponent equal to the number of cards that player has drawn this turn. // Metalcraft - If you control three or more artifacts, Molten Psyche deals damage to each opponent equal to the number of cards that player has drawn this turn.
@ -106,10 +106,6 @@ class MoltenPsycheEffect extends OneShotEffect {
Player player = game.getPlayer(playerId); Player player = game.getPlayer(playerId);
if (player != null) { if (player != null) {
player.drawCards(cardsToDraw.get(playerId), game); player.drawCards(cardsToDraw.get(playerId), game);
if (MetalcraftCondition.instance.apply(game, source) && !playerId.equals(source.getControllerId())) {
MoltenPsycheWatcher watcher = (MoltenPsycheWatcher) game.getState().getWatchers().get(MoltenPsycheWatcher.class.getSimpleName());
player.damage(watcher.getDraws(playerId), source.getSourceId(), game, false, true);
}
} }
} }
if (MetalcraftCondition.instance.apply(game, source)) { if (MetalcraftCondition.instance.apply(game, source)) {