Merge branch 'master' into c17KindredCycle

This commit is contained in:
theelk801 2017-08-17 11:13:44 -04:00 committed by GitHub
commit df02c32b0d
11 changed files with 1186 additions and 2 deletions

View file

@ -1948,7 +1948,7 @@ public abstract class GameImpl implements Game, Serializable {
Player controller = this.getPlayer(planeswalker.getControllerId());
if (controller != null) {
Target targetPlaneswalkerToKeep = new TargetPermanent(filterPlaneswalker);
targetPlaneswalkerToKeep.setTargetName(planeswalker.getName() + " to keep?");
targetPlaneswalkerToKeep.setTargetName(planeswalkertype.toString() + " to keep?");
controller.chooseTarget(Outcome.Benefit, targetPlaneswalkerToKeep, null, this);
for (Permanent dupPlaneswalker : this.getBattlefield().getActivePermanents(filterPlaneswalker, planeswalker.getControllerId(), this)) {
if (!targetPlaneswalkerToKeep.getTargets().contains(dupPlaneswalker.getId())) {