Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Merge remote-tracking branch 'magefree/master'

Browse source 
# Conflicts:
#
Mage/src/main/java/mage/abilities/condition/common/SourceHasSubtypeCondi
tion.java
#	Mage/src/main/java/mage/game/permanent/PermanentToken.java
This commit is contained in:
Samuel Sandeen 2016-09-03 20:06:33 -04:00
commit 434be545f7
23 changed files with 602 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java
View file

@ -146,20 +146,22 @@ public class AddCountersTargetEffect extends OneShotEffect {
}
sb.append(" on ");
Target target = mode.getTargets().get(0);
if (target.getNumberOfTargets() == 0) {
sb.append("up to ");
}
if (target.getMaxNumberOfTargets() > 1 || target.getNumberOfTargets() == 0) {
sb.append(target.getMaxNumberOfTargets()).append(" target ").append(target.getTargetName());
} else {
if (!target.getTargetName().startsWith("another")) {
sb.append("target ");
if (mode.getTargets().size() > 0) {
Target target = mode.getTargets().get(0);
if (target.getNumberOfTargets() == 0) {
sb.append("up to ");
}
sb.append(target.getTargetName());
if (target.getMaxNumberOfTargets() > 1 || target.getNumberOfTargets() == 0) {
sb.append(target.getMaxNumberOfTargets()).append(" target ").append(target.getTargetName());
} else {
if (!target.getTargetName().startsWith("another")) {
sb.append("target ");
}
sb.append(target.getTargetName());
}
} else {
sb.append("that creature");
}
if (amount.getMessage().length() > 0) {