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

* Spellskite - Fixed that target could wrongly not be changed to spellskite in some cases.

Browse source
This commit is contained in:
LevelX2 2014-07-29 17:44:42 +02:00
parent 48f0437bc7
commit ea1a098300
7 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
View file

@ -665,7 +665,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
card = pickWorstCard(cards, null, target, source, game); card = pickWorstCard(cards, null, target, source, game);
} }
if (source != null) { if (source != null) {
if (target.canTarget(card.getId(), this.getId(), source, game)) { if (target.canTarget(this.getId(), card.getId(), source, game)) {
return card; return card;
} }
} }

2
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
View file

@ -293,7 +293,7 @@ public class HumanPlayer extends PlayerImpl {
return true; return true;
} }
} }
} else if (target.canTarget(response.getUUID(), playerId, source, game)) { } else if (target.canTarget(playerId, response.getUUID(), source, game)) {
target.addTarget(response.getUUID(), source, game); target.addTarget(response.getUUID(), source, game);
if(target.doneChosing()){ if(target.doneChosing()){
return true; return true;

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

@ -109,7 +109,7 @@ class SpellskiteEffect extends OneShotEffect {
} }
if (targets.size() == 1 && targets.get(0).getTargets().size() == 1) { if (targets.size() == 1 && targets.get(0).getTargets().size() == 1) {
Target target = targets.get(0); Target target = targets.get(0);
if (target.canTarget(source.getSourceId(), stackObject.getControllerId(), sourceAbility, game)) { if (target.canTarget(stackObject.getControllerId(), source.getSourceId(), sourceAbility, game)) {
oldTarget = game.getObject(targets.getFirstTarget()); oldTarget = game.getObject(targets.getFirstTarget());
target.clearChosen(); target.clearChosen();
target.add(source.getSourceId(), game); target.add(source.getSourceId(), game);
@ -128,7 +128,7 @@ class SpellskiteEffect extends OneShotEffect {
name = object.getName(); 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 (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(), stackObject.getControllerId(), sourceAbility, game)) { if (target.canTarget(stackObject.getControllerId(), source.getSourceId(), sourceAbility, game)) {
oldTarget = game.getObject(targets.getFirstTarget()); oldTarget = game.getObject(targets.getFirstTarget());
target.remove(targetId); target.remove(targetId);
target.addTarget(source.getSourceId(), source, game); target.addTarget(source.getSourceId(), source, game);

2
Mage/src/mage/target/Target.java
View file

@ -66,7 +66,7 @@ public interface Target extends Serializable {
void addTarget(UUID id, int amount, Ability source, Game game, boolean skipEvent); void addTarget(UUID id, int amount, Ability source, Game game, boolean skipEvent);
boolean canTarget(UUID id, Game game); boolean canTarget(UUID id, Game game);
boolean canTarget(UUID id, Ability source, Game game); boolean canTarget(UUID id, Ability source, Game game);
boolean canTarget(UUID id, UUID playerId, Ability source, Game game); boolean canTarget(UUID playerId, UUID id, Ability source, Game game);
boolean isLegal(Ability source, Game game); boolean isLegal(Ability source, Game game);
List<? extends Target> getTargetOptions(Ability source, Game game); List<? extends Target> getTargetOptions(Ability source, Game game);

2
Mage/src/mage/target/TargetObject.java
View file

@ -90,7 +90,7 @@ public abstract class TargetObject extends TargetImpl {
} }
@Override @Override
public boolean canTarget(UUID id, UUID playerId, Ability source, Game game) { public boolean canTarget(UUID playerId, UUID id, Ability source, Game game) {
return canTarget(id, source, game); return canTarget(id, source, game);
} }

2
Mage/src/mage/target/common/TargetCardInHand.java
View file

@ -78,7 +78,7 @@ public class TargetCardInHand extends TargetCard {
@Override @Override
public boolean canTarget(UUID id, Ability source, Game game) { public boolean canTarget(UUID id, Ability source, Game game) {
return this.canTarget(id, source.getControllerId(), source, game); return this.canTarget(source.getControllerId(), id, source, game);
} }
@Override @Override

2
Mage/src/mage/target/common/TargetCreatureOrPlayer.java
View file

@ -92,7 +92,7 @@ public class TargetCreatureOrPlayer extends TargetImpl {
@Override @Override
public boolean canTarget(UUID id, Ability source, Game game) { public boolean canTarget(UUID id, Ability source, Game game) {
return canTarget(null, id, source, game); return canTarget(source.getControllerId(), id, source, game);
} }
@Override @Override