From 329352f36b7628b1b4a94b4afcfee1a5f029e7ed Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 23 Jul 2020 12:22:07 +0200 Subject: [PATCH] Hunters' Feast - Fixed rule text (fixes #6878). --- Mage.Sets/src/mage/cards/h/HuntersFeast.java | 5 ++--- .../effects/common/GainLifeTargetEffect.java | 18 ++++++++---------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/Mage.Sets/src/mage/cards/h/HuntersFeast.java b/Mage.Sets/src/mage/cards/h/HuntersFeast.java index 8da07218961..24b87153c94 100644 --- a/Mage.Sets/src/mage/cards/h/HuntersFeast.java +++ b/Mage.Sets/src/mage/cards/h/HuntersFeast.java @@ -1,5 +1,3 @@ - - package mage.cards.h; import java.util.UUID; @@ -16,8 +14,9 @@ import mage.target.TargetPlayer; public final class HuntersFeast extends CardImpl { public HuntersFeast(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{G}"); + // Any number of target players each gain 6 life. this.getSpellAbility().addTarget(new TargetPlayer(0, Integer.MAX_VALUE, false)); this.getSpellAbility().addEffect(new GainLifeTargetEffect(6)); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java index 98210835fbf..25579ab5b68 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java @@ -1,18 +1,15 @@ - - package mage.abilities.effects.common; -import mage.constants.Outcome; +import java.util.UUID; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.OneShotEffect; +import mage.constants.Outcome; import mage.game.Game; import mage.players.Player; -import java.util.UUID; - /** * * @author BetaSteward_at_googlemail.com @@ -42,7 +39,7 @@ public class GainLifeTargetEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - for (UUID playerId: targetPointer.getTargets(game, source)) { + for (UUID playerId : targetPointer.getTargets(game, source)) { Player player = game.getPlayer(playerId); if (player != null) { player.gainLife(life.calculate(game, source, this), game, source); @@ -59,12 +56,13 @@ public class GainLifeTargetEffect extends OneShotEffect { StringBuilder sb = new StringBuilder(); String message = life.getMessage(); - if (!mode.getTargets().isEmpty()) { - sb.append("target ").append(mode.getTargets().get(0).getTargetName()); + if (!mode.getTargets().isEmpty() && mode.getTargets().get(0).getMaxNumberOfTargets() == Integer.MAX_VALUE) { + sb.append("any number of target players each gain "); + } else if (!mode.getTargets().isEmpty()) { + sb.append("target ").append(mode.getTargets().get(0).getTargetName()).append(" gains "); } else { - sb.append("that player"); + sb.append("that player gains "); } - sb.append(" gains "); if (message.isEmpty() || !message.equals("1")) { sb.append(life.toString()).append(' '); }