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

fixed effects which prevent damage divided among several targets

Browse source
This commit is contained in:
Evan Kranzler 2018-06-05 09:26:03 -04:00
parent e3c9204092
commit 3dfa2943d4
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/p/PollenRemedy.java
View file

@ -35,7 +35,7 @@ public final class PollenRemedy extends CardImpl {
// Prevent the next 3 damage that would be dealt this turn to any number of target creatures and/or players, divided as you choose. If Pollen Remedy was kicked, prevent the next 6 damage this way instead.
Effect effect = new ConditionalReplacementEffect(new PreventDamageToTargetMultiAmountEffect(Duration.EndOfTurn, 6),
KickedCondition.instance, new PreventDamageToTargetMultiAmountEffect(Duration.EndOfTurn, 3));
effect.setText("Prevent the next 3 damage that would be dealt this turn to any number of target creatures and/or players, divided as you choose. if this spell was kicked, prevent the next 6 damage this way instead.");
effect.setText("Prevent the next 3 damage that would be dealt this turn to any number of targets, divided as you choose. if this spell was kicked, prevent the next 6 damage this way instead.");
this.getSpellAbility().addEffect(effect);
originalId = this.getSpellAbility().getOriginalId();
}

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

@ -1,5 +1,3 @@
package mage.abilities.effects.common;
import java.util.HashMap;
@ -15,13 +13,12 @@ import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.Target;
import mage.target.common.TargetCreatureOrPlayerAmount;
import mage.target.TargetAmount;
/**
*
* @author LevelX2
*/
public class PreventDamageToTargetMultiAmountEffect extends PreventionEffectImpl {
private final Map<UUID, Integer> targetAmountMap = new HashMap<>();
@ -44,9 +41,9 @@ public class PreventDamageToTargetMultiAmountEffect extends PreventionEffectImpl
super.init(source, game);
Target target = source.getTargets().get(0);
MageObject sourceObject = game.getObject(source.getSourceId());
if (target instanceof TargetCreatureOrPlayerAmount && sourceObject != null) {
TargetCreatureOrPlayerAmount multiTarget = (TargetCreatureOrPlayerAmount) target;
for (UUID targetId: multiTarget.getTargets()) {
if (target instanceof TargetAmount && sourceObject != null) {
TargetAmount multiTarget = (TargetAmount) target;
for (UUID targetId : multiTarget.getTargets()) {
Player player = null;
Permanent permanent = game.getPermanent(targetId);
if (permanent == null) {
@ -107,7 +104,7 @@ public class PreventDamageToTargetMultiAmountEffect extends PreventionEffectImpl
if (duration == Duration.EndOfTurn) {
sb.append("this turn ");
}
sb.append("to any number of target creatures and/or players, divided as you choose");
sb.append("to any number of targets, divided as you choose");
return sb.toString();
}