github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Duplicated code in "return to its owner's hand" effect
This commit is contained in:
LevelX2 2020-08-31 09:18:10 +02:00 committed by GitHub
commit bbf30c6f74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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