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

* Molten Psyche - Fixed that the damage was wrongly also dealt to the spell controller.

Browse source
This commit is contained in:
LevelX2 2016-03-07 16:36:20 +01:00
parent bd43cf0e1e
commit 7de8694493
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenPsyche.java
View file

@ -30,7 +30,6 @@ package mage.sets.scarsofmirrodin;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.condition.common.MetalcraftCondition;
@ -97,7 +96,7 @@ class MoltenPsycheEffect extends OneShotEffect {
if (cardsInHand > 0) {
cardsToDraw.put(playerId, cardsInHand);
}
player.moveCards(player.getHand(), Zone.HAND, Zone.LIBRARY, source, game);
player.moveCards(player.getHand(), Zone.LIBRARY, source, game);
player.shuffleLibrary(source, game);
}
}
@ -117,9 +116,11 @@ class MoltenPsycheEffect extends OneShotEffect {
if (MetalcraftCondition.getInstance().apply(game, source)) {
MoltenPsycheWatcher watcher = (MoltenPsycheWatcher) game.getState().getWatchers().get("CardsDrawn");
for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) {
Player player = game.getPlayer(playerId);
if (player != null) {
player.damage(watcher.getDraws(playerId), source.getSourceId(), game, false, true);
if (game.isOpponent(controller, playerId)) {
Player player = game.getPlayer(playerId);
if (player != null) {
player.damage(watcher.getDraws(playerId), source.getSourceId(), game, false, true);
}
}
}
}
@ -146,9 +147,7 @@ class MoltenPsycheWatcher extends Watcher {
public MoltenPsycheWatcher(final MoltenPsycheWatcher watcher) {
super(watcher);
for (Entry<UUID, Integer> entry : watcher.draws.entrySet()) {
draws.put(entry.getKey(), entry.getValue());
}
this.draws.putAll(watcher.draws);
}
@Override