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

* Spellskite - Fixed that target is not changed to Spellskite if Spellskite is no valid taregt for the origin spell (e.g. Ranger's Guile of opponent player).

Browse source
This commit is contained in:
LevelX2 2014-06-18 16:10:39 +02:00
parent ab3386ac25
commit 889fd417b2
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Mage.Sets/src/mage/sets/newphyrexia/Spellskite.java
View file

@ -94,23 +94,26 @@ class SpellskiteEffect extends OneShotEffect {
MageObject sourceObject = game.getObject(source.getSourceId());
if (stackObject != null && sourceObject != null) {
Targets targets;
Ability sourceAbility;
MageObject oldTarget = null;
if (stackObject instanceof Spell) {
Spell spell = (Spell)stackObject;
sourceAbility = spell.getSpellAbility();
targets = spell.getSpellAbility().getTargets();
} else if (stackObject instanceof StackAbility) {
StackAbility stackAbility = (StackAbility)stackObject;
sourceAbility = stackAbility;
targets = stackAbility.getTargets();
} else {
return false;
}
if (targets.size() == 1 && targets.get(0).getTargets().size() == 1) {
Target target = targets.get(0);
if (target.canTarget(source.getSourceId(), game)) {
if (target.canTarget(source.getSourceId(), stackObject.getControllerId(), sourceAbility, game)) {
oldTarget = game.getObject(targets.getFirstTarget());
target.clearChosen();
target.add(source.getSourceId(), game);
}
}
}
else {
Player player = game.getPlayer(source.getControllerId());
@ -125,7 +128,7 @@ class SpellskiteEffect extends OneShotEffect {
name = object.getName();
}
if (name != null && player.chooseUse(Outcome.Neutral, new StringBuilder("Change target from ").append(name).append(" to ").append(sourceObject.getName()).append("?").toString(), game)) {
if (target.canTarget(source.getSourceId(), game)) {
if (target.canTarget(source.getSourceId(), stackObject.getControllerId(), sourceAbility, game)) {
oldTarget = game.getObject(targets.getFirstTarget());
target.remove(targetId);
target.addTarget(source.getSourceId(), source, game);
@ -137,6 +140,8 @@ class SpellskiteEffect extends OneShotEffect {
}
if (oldTarget != null) {
game.informPlayers(new StringBuilder(sourceObject.getName()).append(": Changed target of ").append(stackObject.getName()).append(" from ").append(oldTarget.getName()).append(" to ").append(sourceObject.getName()).toString());
} else {
game.informPlayers(sourceObject.getLogName() + ": Target not changed to " + sourceObject.getLogName() + " because its no valid target for " + stackObject.getName());
}
return true;
}