diff --git a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java index f56de68edb2..15bc8d25af4 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CreateTokenTargetEffect.java @@ -71,10 +71,12 @@ public class CreateTokenTargetEffect extends OneShotEffect { StringBuilder sb = new StringBuilder(); if (mode.getTargets().isEmpty()) { - return ""; + sb.append("target player"); + } + else { + sb.append("target ").append(mode.getTargets().get(0).getTargetName()); } - sb.append("target ").append(mode.getTargets().get(0).getTargetName()); sb.append(" creates "); if (amount.toString().equals("1")) { sb.append("a "); diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java index 89253882c3c..363c97fc4a8 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldTargetEffect.java @@ -67,20 +67,20 @@ public class ReturnFromGraveyardToBattlefieldTargetEffect extends OneShotEffect StringBuilder sb = new StringBuilder(); if (mode.getTargets().isEmpty()) { - return ""; - } - - Target target = mode.getTargets().get(0); - sb.append("return "); - if (target.getMaxNumberOfTargets() > 1) { - if (target.getMaxNumberOfTargets() != target.getNumberOfTargets()) { - sb.append("up to "); + sb.append("return target creature to the battlefield"); + } else { + Target target = mode.getTargets().get(0); + sb.append("return "); + if (target.getMaxNumberOfTargets() > 1) { + if (target.getMaxNumberOfTargets() != target.getNumberOfTargets()) { + sb.append("up to "); + } + sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(' '); + } + sb.append("target ").append(mode.getTargets().get(0).getTargetName()).append(" to the battlefield"); + if (tapped) { + sb.append(" tapped"); } - sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(' '); - } - sb.append("target ").append(mode.getTargets().get(0).getTargetName()).append(" to the battlefield"); - if (tapped) { - sb.append(" tapped"); } sb.append(" under your control"); return sb.toString(); diff --git a/Mage/src/main/java/mage/abilities/effects/common/TapAllTargetPlayerControlsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/TapAllTargetPlayerControlsEffect.java index b76a0082d92..cc531c79454 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/TapAllTargetPlayerControlsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/TapAllTargetPlayerControlsEffect.java @@ -52,9 +52,8 @@ public class TapAllTargetPlayerControlsEffect extends OneShotEffect { return staticText; } - if (mode.getTargets().isEmpty()) { - return ""; - } - return "tap all " + filter.toString() + " target " + mode.getTargets().get(0).getTargetName() + " controls"; + return "tap all " + filter.toString() + " target " + + (mode.getTargets().size() == 0 ? "player" : mode.getTargets().get(0).getTargetName()) + + " controls"; } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/TapTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/TapTargetEffect.java index 91537f95359..e3aa5c5c56b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/TapTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/TapTargetEffect.java @@ -55,7 +55,7 @@ public class TapTargetEffect extends OneShotEffect { } if (mode.getTargets().isEmpty()) { - return ""; + return "tap target permanent"; } Target target = mode.getTargets().get(0); diff --git a/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java index a4043355277..d474f15cc81 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/UntapTargetEffect.java @@ -67,7 +67,7 @@ public class UntapTargetEffect extends OneShotEffect { } if (mode.getTargets().isEmpty()) { - return ""; + return "untap target permanent"; } Target target = mode.getTargets().get(0); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainControlTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainControlTargetEffect.java index e7fefa6dc04..8e4d51164b1 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainControlTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainControlTargetEffect.java @@ -114,7 +114,7 @@ public class GainControlTargetEffect extends ContinuousEffectImpl { } if (mode.getTargets().isEmpty()) { - return ""; + return "gain control of target permanent"; } Target target = mode.getTargets().get(0); diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/EchoEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/EchoEffect.java index 76c04a4ab5b..15978c837b3 100644 --- a/Mage/src/main/java/mage/abilities/effects/keyword/EchoEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/keyword/EchoEffect.java @@ -82,7 +82,8 @@ public class EchoEffect extends OneShotEffect { StringBuilder sb = new StringBuilder("sacrifice {this} unless you "); if (cost == null) { - return ""; + sb.append("pay this permanent's mana cost"); + return sb.toString(); } String costText = cost.getText();