External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 21:12:04 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Fixed that choose opponent was handled targeted but shouldn't (e.g.used for Stalking Leonin) fixed #6836.

Browse source
This commit is contained in:
LevelX2 2020-07-13 17:13:30 +02:00
parent 362352954b
commit f3fafbdb14
1 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

76
Mage/src/main/java/mage/abilities/effects/common/ChooseSecretOpponentEffect.java
View file

@ -9,6 +9,7 @@ import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.common.TargetOpponent;
import mage.util.CardUtil;
/**
*
* @author LevelX2
@ -19,50 +20,49 @@ public class ChooseSecretOpponentEffect extends OneShotEffect {
public static final String SECRET_OPPONENT = "_secOpp";
public static final String SECRET_OWNER = "_secOwn";
public ChooseSecretOpponentEffect() {
super(Outcome.Neutral);
staticText = "secretly choose an opponent";
}
public ChooseSecretOpponentEffect() {
super(Outcome.Neutral);
staticText = "secretly choose an opponent";
}
public ChooseSecretOpponentEffect(final ChooseSecretOpponentEffect effect) {
super(effect);
}
public ChooseSecretOpponentEffect(final ChooseSecretOpponentEffect effect) {
super(effect);
}
@Override
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
MageObject mageObject = game.getPermanentEntering(source.getSourceId());
if (mageObject == null) {
mageObject = game.getObject(source.getSourceId());
}
if (controller != null && mageObject != null) {
TargetOpponent targetOpponent = new TargetOpponent();
targetOpponent.setTargetName("opponent (secretly)");
while (!controller.choose(outcome, targetOpponent, source.getSourceId(), game)) {
if (!controller.canRespond()) {
return false;
}
}
if (targetOpponent.getTargets().isEmpty()) {
@Override
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
MageObject mageObject = game.getPermanentEntering(source.getSourceId());
if (mageObject == null) {
mageObject = game.getObject(source.getSourceId());
}
if (controller != null && mageObject != null) {
TargetOpponent targetOpponent = new TargetOpponent(true);
targetOpponent.setTargetName("opponent (secretly)");
while (!controller.choose(outcome, targetOpponent, source.getSourceId(), game)) {
if (!controller.canRespond()) {
return false;
}
if (!game.isSimulation()) {
game.informPlayers(mageObject.getName() + ": " + controller.getLogName() + " has secretly chosen an opponent.");
}
game.getState().setValue(mageObject.getId() + SECRET_OPPONENT, targetOpponent.getTargets().get(0));
game.getState().setValue(mageObject.getId() + SECRET_OWNER, controller.getId());
if (mageObject instanceof Permanent) {
((Permanent) mageObject).addInfo(SECRET_OPPONENT,
CardUtil.addToolTipMarkTags(controller.getLogName() + " has secretly chosen an opponent."), game);
}
}
return false;
}
@Override
public ChooseSecretOpponentEffect copy() {
return new ChooseSecretOpponentEffect(this);
if (targetOpponent.getTargets().isEmpty()) {
return false;
}
if (!game.isSimulation()) {
game.informPlayers(mageObject.getName() + ": " + controller.getLogName() + " has secretly chosen an opponent.");
}
game.getState().setValue(mageObject.getId() + SECRET_OPPONENT, targetOpponent.getTargets().get(0));
game.getState().setValue(mageObject.getId() + SECRET_OWNER, controller.getId());
if (mageObject instanceof Permanent) {
((Permanent) mageObject).addInfo(SECRET_OPPONENT,
CardUtil.addToolTipMarkTags(controller.getLogName() + " has secretly chosen an opponent."), game);
}
}
return false;
}
@Override
public ChooseSecretOpponentEffect copy() {
return new ChooseSecretOpponentEffect(this);
}
}