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

Merge pull request #7017 from acabaca24/branch-for-issue6643

Browse source 
Correcting some M21 text issues
This commit is contained in:
Oleg Agafonov 2020-08-29 21:34:59 +02:00 • committed by GitHub
commit 0cad4acf31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Mage/src/main/java/mage/abilities/effects/common/ReturnToHandTargetEffect.java
View file

@ -90,15 +90,13 @@ public class ReturnToHandTargetEffect extends OneShotEffect {
}
Target target = mode.getTargets().get(0);
StringBuilder sb = new StringBuilder("return ");
if (target.getNumberOfTargets() == 0 && target.getMaxNumberOfTargets() > 0) {
if (target.getMinNumberOfTargets() == 0 && target.getMaxNumberOfTargets() > 0) {
sb.append("up to ");
sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets()));
if (!target.getTargetName().contains("target")) {
sb.append(" target ");
}
sb.append(target.getTargetName());
sb.append(" to their owners' hand");
return sb.toString();
} else {
if (target.getNumberOfTargets() > 1) {
sb.append(CardUtil.numberToText(target.getNumberOfTargets())).append(' ');
@ -106,9 +104,14 @@ public class ReturnToHandTargetEffect extends OneShotEffect {
if (!target.getTargetName().startsWith("another")) {
sb.append("target ");
}
sb.append(target.getTargetName()).append(" to its owner's hand");
return sb.toString();
}
if(target.getMaxNumberOfTargets() > 1) {
sb.append(" to their owners' hand");
}
else {
sb.append(target.getTargetName()).append(" to its owner's hand");
}
return sb.toString();
}
}