1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-13 09:11:06 -09:00

updated Spellskite

This commit is contained in:
BetaSteward 2011-09-14 12:44:27 -04:00
parent d9f846f783
commit 37cec55493

View file

@ -92,8 +92,11 @@ class SpellskiteEffect extends OneShotEffect<SpellskiteEffect> {
if (spell != null) { if (spell != null) {
Targets targets = spell.getSpellAbility().getTargets(); Targets targets = spell.getSpellAbility().getTargets();
if (targets.size() == 1 && targets.get(0).getTargets().size() == 1) { if (targets.size() == 1 && targets.get(0).getTargets().size() == 1) {
targets.get(0).clearChosen(); Target target = targets.get(0);
targets.get(0).add(source.getSourceId(), game); if (target.canTarget(source.getSourceId(), game)) {
target.clearChosen();
target.add(source.getSourceId(), game);
}
} }
else { else {
Player player = game.getPlayer(source.getControllerId()); Player player = game.getPlayer(source.getControllerId());
@ -108,6 +111,7 @@ class SpellskiteEffect extends OneShotEffect<SpellskiteEffect> {
name = object.getName(); name = object.getName();
} }
if (name != null && player.chooseUse(Outcome.Neutral, "Change target from " + name + " to {this}?", game)) { if (name != null && player.chooseUse(Outcome.Neutral, "Change target from " + name + " to {this}?", game)) {
if (target.canTarget(source.getSourceId(), game)) {
target.remove(targetId); target.remove(targetId);
target.addTarget(source.getSourceId(), source, game); target.addTarget(source.getSourceId(), source, game);
break; break;
@ -115,6 +119,7 @@ class SpellskiteEffect extends OneShotEffect<SpellskiteEffect> {
} }
} }
} }
}
} }
return false; return false;
} }