From c39bcf3d5adae73efc23cf3e903ed3deab9a82cd Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 29 Jun 2020 15:25:55 +0200 Subject: [PATCH] * Primal Might - Handled fizzled message for optional fight effect (#6646). --- .../mage/abilities/effects/common/FightTargetsEffect.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/abilities/effects/common/FightTargetsEffect.java b/Mage/src/main/java/mage/abilities/effects/common/FightTargetsEffect.java index 94fa24457f..6661533d8e 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/FightTargetsEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/FightTargetsEffect.java @@ -34,6 +34,7 @@ public class FightTargetsEffect extends OneShotEffect { if (card != null) { UUID target1Id = null; UUID target2Id = null; + boolean secondTargetOptional = false; // first target is in target pointer, second target is a normal target if (source.getTargets().size() < 2) { if (!source.getTargets().get(0).isLegal(source, game)) { @@ -48,6 +49,7 @@ public class FightTargetsEffect extends OneShotEffect { } else if (source.getTargets().get(0).isLegal(source, game) && source.getTargets().get(1).isLegal(source, game)) { target1Id = source.getTargets().get(0).getFirstTarget(); target2Id = source.getTargets().get(1).getFirstTarget(); + secondTargetOptional = source.getTargets().get(1).getMinNumberOfTargets() == 0; } Permanent creature1 = game.getPermanent(target1Id); Permanent creature2 = game.getPermanent(target2Id); @@ -57,7 +59,7 @@ public class FightTargetsEffect extends OneShotEffect { return creature1.fight(creature2, source, game); } } - if (!game.isSimulation()) { + if (!game.isSimulation() && !secondTargetOptional) { game.informPlayers(card.getName() + " has been fizzled."); } }