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

* Mirari - Fixed that it can select any spell instead triggered use.

Browse source
This commit is contained in:
Oleg Agafonov 2018-11-22 21:53:32 +04:00
parent 9d7c59fed9
commit e5bdb85076
3 changed files with 32 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Mage/src/main/java/mage/abilities/effects/common/CopyTargetSpellEffect.java
View file

@ -1,4 +1,3 @@
package mage.abilities.effects.common;
import mage.abilities.Ability;
@ -13,7 +12,6 @@ import mage.players.Player;
/**
* @author BetaSteward_at_googlemail.com
*
*/
public class CopyTargetSpellEffect extends OneShotEffect {
@ -79,7 +77,14 @@ public class CopyTargetSpellEffect extends OneShotEffect {
return staticText;
}
StringBuilder sb = new StringBuilder();
sb.append("copy target ").append(mode.getTargets().get(0).getTargetName()).append(". You may choose new targets for the copy");
sb.append("copy ");
if (!mode.getTargets().isEmpty()) {
sb.append("target ").append(mode.getTargets().get(0).getTargetName());
} else {
sb.append("that spell");
}
sb.append(". You may choose new targets for the copy");
return sb.toString();
}
}

16
Mage/src/main/java/mage/abilities/effects/common/DoIfCostPaid.java
View file

@ -1,6 +1,5 @@
package mage.abilities.effects.common;
import java.util.Locale;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.Mode;
@ -14,6 +13,8 @@ import mage.game.Game;
import mage.players.Player;
import mage.util.CardUtil;
import java.util.Locale;
public class DoIfCostPaid extends OneShotEffect {
protected Effects executingEffects = new Effects();
@ -27,9 +28,10 @@ public class DoIfCostPaid extends OneShotEffect {
}
public DoIfCostPaid(Effect effect, Effect effect2, Cost cost) {
this(effect,effect2,cost,true);
this(effect, effect2, cost, true);
}
public DoIfCostPaid(Effect effect, Effect effect2, Cost cost,boolean optional) {
public DoIfCostPaid(Effect effect, Effect effect2, Cost cost, boolean optional) {
this(effect, cost, null, optional);
this.otherwiseEffects.add(effect2);
}
@ -62,6 +64,14 @@ public class DoIfCostPaid extends OneShotEffect {
return this;
}
public Effects getExecutingEffects() {
return this.executingEffects;
}
public Effects getOtherwiseEffects() {
return this.otherwiseEffects;
}
@Override
public boolean apply(Game game, Ability source) {
Player player = getPayingPlayer(game, source);