From 491eba3910adfd9e3de8e32af1f85b0d4639c3c7 Mon Sep 17 00:00:00 2001
From: Zzooouhh <Zzooouhh@users.noreply.github.com>
Date: Sun, 19 Nov 2017 21:42:31 +0100
Subject: [PATCH] Added new restriction to second target

---
 .../src/mage/cards/b/BalduvianWarlord.java    | 82 +++++++++++++------
 1 file changed, 57 insertions(+), 25 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/b/BalduvianWarlord.java b/Mage.Sets/src/mage/cards/b/BalduvianWarlord.java
index bd0ee58372..12f654c3aa 100644
--- a/Mage.Sets/src/mage/cards/b/BalduvianWarlord.java
+++ b/Mage.Sets/src/mage/cards/b/BalduvianWarlord.java
@@ -27,6 +27,8 @@
  */
 package mage.cards.b;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 import mage.MageInt;
@@ -46,6 +48,7 @@ import mage.constants.PhaseStep;
 import mage.constants.Zone;
 import mage.filter.common.FilterAttackingCreature;
 import mage.filter.common.FilterBlockingCreature;
+import mage.filter.predicate.Predicate;
 import mage.game.Game;
 import mage.game.combat.CombatGroup;
 import mage.game.events.GameEvent;
@@ -126,36 +129,65 @@ class BalduvianWarlordUnblockEffect extends OneShotEffect {
 
             // Choose new creature to block
             if (permanent.isCreature()) {
-                TargetAttackingCreature target = new TargetAttackingCreature(1, 1, new FilterAttackingCreature(), true);
-                if (target.canChoose(source.getSourceId(), controller.getId(), game)) {
-                    while (!target.isChosen() && target.canChoose(controller.getId(), game) && controller.canRespond()) {
-                        controller.chooseTarget(outcome, target, source, game);
-                    }
-                } else {
-                    return true;
-                }
-                Permanent chosenPermanent = game.getPermanent(target.getFirstTarget());
-                if (chosenPermanent != null && permanent != null && chosenPermanent.isCreature() && controller != null) {
-                    CombatGroup chosenGroup = game.getCombat().findGroup(chosenPermanent.getId());
-                    if (chosenGroup != null) {
-                        // Relevant ruling for Balduvian Warlord:
-                        // 7/15/2006 	If an attacking creature has an ability that triggers “When this creature becomes blocked,” 
-                        // it triggers when a creature blocks it due to the Warlord’s ability only if it was unblocked at that point.
-                        
-                        boolean notYetBlocked = true;
-                        if (!chosenGroup.getBlockers().isEmpty()) {
-                            notYetBlocked = false;
+                // according to the following mail response from MTG Rules Management:
+                // "if Player A attacks Players B and C, Player B's creatures cannot block creatures attacking Player C"
+                // therefore we need to single out creatures attacking the target blocker's controller (disappointing, I know)
+                
+                List<Permanent> list = new ArrayList<>();
+                for (CombatGroup combatGroup : game.getCombat().getGroups()) {
+                    if (combatGroup.getDefendingPlayerId().equals(permanent.getControllerId())) {
+                        for (UUID attackingCreatureId : combatGroup.getAttackers()) {
+                            Permanent targetsControllerAttacker = game.getPermanent(attackingCreatureId);
+                            list.add(targetsControllerAttacker);
                         }
-                        chosenGroup.addBlocker(permanent.getId(), controller.getId(), game);
-                        if (notYetBlocked) {
-                            game.fireEvent(GameEvent.getEvent(GameEvent.EventType.CREATURE_BLOCKED, chosenPermanent.getId(), null));
-                        }
-                        game.fireEvent(GameEvent.getEvent(GameEvent.EventType.BLOCKER_DECLARED, chosenPermanent.getId(), permanent.getId(), permanent.getControllerId()));
                     }
                 }
-                return true;   
+                Player targetsController = game.getPlayer(permanent.getControllerId());
+                if (targetsController != null) {
+                    FilterAttackingCreature filter = new FilterAttackingCreature("creature attacking " + targetsController.getLogName());
+                    filter.add(new PermanentInListPredicate(list));
+                    TargetAttackingCreature target = new TargetAttackingCreature(1, 1, filter, true);
+                    if (target.canChoose(source.getSourceId(), controller.getId(), game)) {
+                        while (!target.isChosen() && target.canChoose(controller.getId(), game) && controller.canRespond()) {
+                            controller.chooseTarget(outcome, target, source, game);
+                        }
+                    } else {
+                        return true;
+                    }
+                    Permanent chosenPermanent = game.getPermanent(target.getFirstTarget());
+                    if (chosenPermanent != null && permanent != null && chosenPermanent.isCreature() && controller != null) {
+                        CombatGroup chosenGroup = game.getCombat().findGroup(chosenPermanent.getId());
+                        if (chosenGroup != null) {
+                            // Relevant ruling for Balduvian Warlord:
+                            // 7/15/2006 	If an attacking creature has an ability that triggers “When this creature becomes blocked,” 
+                            // it triggers when a creature blocks it due to the Warlord’s ability only if it was unblocked at that point.
+                            
+                            boolean notYetBlocked = chosenGroup.getBlockers().isEmpty();
+                            chosenGroup.addBlocker(permanent.getId(), controller.getId(), game);
+                            if (notYetBlocked) {
+                                game.fireEvent(GameEvent.getEvent(GameEvent.EventType.CREATURE_BLOCKED, chosenPermanent.getId(), null));
+                            }
+                            game.fireEvent(GameEvent.getEvent(GameEvent.EventType.BLOCKER_DECLARED, chosenPermanent.getId(), permanent.getId(), permanent.getControllerId()));
+                        }
+                    }
+                }
+                return true;
             }
         }
         return false;
     }
 }
+
+class PermanentInListPredicate implements Predicate<Permanent> {
+
+    private final List<Permanent> permanents;
+
+    public PermanentInListPredicate(List<Permanent> permanents) {
+        this.permanents = permanents;
+    }
+
+    @Override
+    public boolean apply(Permanent input, Game game) {
+        return permanents.contains(input);
+    }
+}